From ac93a725c43433f92f4b125e4310fb93e0459c3c Mon Sep 17 00:00:00 2001 From: Ties de Kock Date: Tue, 2 May 2023 09:53:55 +0200 Subject: [PATCH 1/5] Use gradle build action 2.4.2 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec44091..835af92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: java-version: ${{ matrix.java }} - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v2.4.2 - name: Execute Gradle build run: ./gradlew build @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v2.4.2 - name: Login to Docker Hub uses: docker/login-action@v2 From a13b80fa99107c8513bf0a0020dac84ee6203fa7 Mon Sep 17 00:00:00 2001 From: Mikhail Puzanov Date: Thu, 13 Jul 2023 13:10:48 +0200 Subject: [PATCH 2/5] Use github container registry instead of dockerhub --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 835af92..3b41624 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,11 +41,12 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v2.4.2 - - name: Login to Docker Hub - uses: docker/login-action@v2 + - name: Login to GHCR + uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Set up Docker Buildx id: buildx From fd7af9d87780a68dfae473a66fbff1b852feb31c Mon Sep 17 00:00:00 2001 From: Mikhail Puzanov Date: Thu, 13 Jul 2023 13:12:20 +0200 Subject: [PATCH 3/5] Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 14ab784..62b6fe4 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ Changelog --------- ### main: + * Publish docker image to GHCR insetead of dockerhub * Updated github actions * Add feature to revoke objects that TA0 knows off, but are not requested (e.g. leftover files on manifest). From 58933c52d0124e3c0c5e5bfbf3b97d9dc53e00eb Mon Sep 17 00:00:00 2001 From: Mikhail Puzanov Date: Fri, 14 Jul 2023 12:14:42 +0200 Subject: [PATCH 4/5] Fix jib --- README.md | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62b6fe4..0d03270 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Changelog * Updated github actions * Add feature to revoke objects that TA0 knows off, but are not requested (e.g. leftover files on manifest). - * Publish docker image `ripencc/rpki-ta-0` + * Publish docker image `ghcr.io/ripe-ncc/rpki-ta-0` ### 0.3.5: * Removed explicit license from all files. diff --git a/build.gradle b/build.gradle index 122873c..281546b 100644 --- a/build.gradle +++ b/build.gradle @@ -126,5 +126,5 @@ jib { } } } - to { image = "ripencc/rpki-ta-0" } + to { image = "ghcr.io/ripe-ncc/rpki-ta-0" } } From 7c8a403c649db335e406302e4ad6fbddd9f08813 Mon Sep 17 00:00:00 2001 From: Ties de Kock Date: Mon, 9 Oct 2023 10:46:23 +0200 Subject: [PATCH 5/5] rpki commons 1.35 and compile with JDK 11 --- .github/workflows/ci.yml | 2 +- README.md | 2 ++ build.gradle | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b41624..5fb0fb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: # test against latest update of each major Java version, as well as specific updates of LTS versions: - java: [ 8, 11, 17 ] + java: [ 11, 17 ] name: Java ${{ matrix.java }} steps: - uses: actions/checkout@v3 diff --git a/README.md b/README.md index 0d03270..224bdd0 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ Changelog * Add feature to revoke objects that TA0 knows off, but are not requested (e.g. leftover files on manifest). * Publish docker image `ghcr.io/ripe-ncc/rpki-ta-0` + * Use rpki-commons 1.35 + * Compile with JDK 11 ### 0.3.5: * Removed explicit license from all files. diff --git a/build.gradle b/build.gradle index 281546b..50b79e0 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ version = ENV['RELEASE_VERSION'] ?: gitRef() description = 'RIPE NCC Trust Anchor' dependencies { - implementation 'net.ripe.rpki:rpki-commons:1.30' + implementation 'net.ripe.rpki:rpki-commons:1.35' implementation 'commons-cli:commons-cli:1.5.0' implementation 'org.slf4j:slf4j-api:2.0.7' runtimeOnly 'org.slf4j:slf4j-simple:2.0.7'