From bc9e8515fe963f68c3daefadccc0030a7fe42fda Mon Sep 17 00:00:00 2001 From: wrossmorrow Date: Wed, 28 Oct 2026 15:11:29 -0700 Subject: [PATCH 1/3] fix: bump and align to java 17 for work --- .github/workflows/main.yaml | 6 ++++-- .github/workflows/pull-request.yaml | 10 ++++++---- .github/workflows/release.yaml | 4 +++- Dockerfile | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a20db63..033cee0 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v7 - uses: actions/setup-java@v6 with: - java-version: '11' + java-version: ${{ vars.WORKING_JAVA_VERSION }} distribution: 'temurin' - uses: gradle/actions/setup-gradle@v6 # also validates the wrapper jar - name: Build, lint and test @@ -38,7 +38,7 @@ jobs: name: jar path: build/libs/*.jar - image: + containerize: name: Publish image to GHCR runs-on: ubuntu-latest needs: build @@ -68,6 +68,8 @@ jobs: uses: docker/build-push-action@v7 with: context: . + build-args: | + DOCKER_BASE_JAVA_VERSION_TAG=${{ vars.DOCKER_BASE_JAVA_VERSION_TAG }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 92028ac..5107b45 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v7 - uses: actions/setup-java@v6 with: - java-version: '11' + java-version: ${{ vars.WORKING_JAVA_VERSION }} distribution: 'temurin' - uses: gradle/actions/setup-gradle@v6 # also validates the wrapper jar - name: Check formatting @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - java: ['11', '17'] + java: ['11', '17', '21'] steps: - uses: actions/checkout@v7 - uses: actions/setup-java@v6 @@ -50,14 +50,14 @@ jobs: name: test-reports-jdk${{ matrix.java }} path: build/reports/tests/ - name: Upload jar - if: matrix.java == '11' + if: matrix.java == '17' uses: actions/upload-artifact@v7 with: name: jar path: build/libs/*.jar retention-days: 3 - image: + containerize: name: Container build (no push) runs-on: ubuntu-latest needs: test @@ -72,6 +72,8 @@ jobs: uses: docker/build-push-action@v7 with: context: . + build-args: | + DOCKER_BASE_JAVA_VERSION_TAG=${{ vars.DOCKER_BASE_JAVA_VERSION_TAG }} push: false tags: ghcr.io/${{ github.repository }}:pr-${{ github.event.pull_request.number }} cache-from: type=gha diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a91f5a3..e7d96db 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v7 - uses: actions/setup-java@v6 with: - java-version: '11' + java-version: ${{ vars.WORKING_JAVA_VERSION }} distribution: 'temurin' - uses: gradle/actions/setup-gradle@v6 # also validates the wrapper jar with: @@ -58,6 +58,8 @@ jobs: uses: docker/build-push-action@v7 with: context: . + build-args: | + DOCKER_BASE_JAVA_VERSION_TAG=${{ vars.DOCKER_BASE_JAVA_VERSION_TAG }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 233a7e1..e4203c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM eclipse-temurin:11 +ARG DOCKER_BASE_JAVA_VERSION_TAG=17 +FROM eclipse-temurin:${DOCKER_BASE_JAVA_VERSION_TAG} WORKDIR /extproc COPY build/libs/extproc-*.jar ./extproc.jar EXPOSE 50051 From ed7617a8a3c0f72bb87e5ffc804565e1d476b7b0 Mon Sep 17 00:00:00 2001 From: wrossmorrow Date: Wed, 28 Oct 2026 15:24:53 -0700 Subject: [PATCH 2/3] ci: use vars for supported versions --- .github/workflows/main.yaml | 1 + .github/workflows/pull-request.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 033cee0..e7e54f8 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -14,6 +14,7 @@ concurrency: cancel-in-progress: false # let each merge finish publishing, in order jobs: + build: name: Build & test runs-on: ubuntu-latest diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 5107b45..9e69c63 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - java: ['11', '17', '21'] + java: ${{ fromJSON(vars.SUPPORTED_JAVA_VERSIONS) }} steps: - uses: actions/checkout@v7 - uses: actions/setup-java@v6 From 1899b78ef6735d68330a56d410fa4bf4dbae954b Mon Sep 17 00:00:00 2001 From: wrossmorrow Date: Wed, 28 Oct 2026 15:33:17 -0700 Subject: [PATCH 3/3] ci: fix cache provider --- .github/workflows/main.yaml | 2 ++ .github/workflows/pull-request.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e7e54f8..eba55e4 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -25,6 +25,8 @@ jobs: java-version: ${{ vars.WORKING_JAVA_VERSION }} distribution: 'temurin' - uses: gradle/actions/setup-gradle@v6 # also validates the wrapper jar + with: + cache-provider: basic - name: Build, lint and test run: ./gradlew build # `check` includes spotlessCheck - name: Upload test reports diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 9e69c63..f11efa7 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -23,6 +23,8 @@ jobs: java-version: ${{ vars.WORKING_JAVA_VERSION }} distribution: 'temurin' - uses: gradle/actions/setup-gradle@v6 # also validates the wrapper jar + with: + cache-provider: basic - name: Check formatting run: ./gradlew spotlessCheck