From 74ccbb3ff74564cfba9c40f432aa7f67c503793c Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 17 Jan 2025 13:29:24 -0500 Subject: [PATCH 1/7] chore: add jdk 23 job for showcase tests Part of introducing support for GraalVM for JDK 23 --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5bfe04b7b6..e97e48ad11 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -214,7 +214,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - java: [ 11, 17, 21 ] + java: [ 11, 17, 21, 23 ] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 @@ -262,8 +262,8 @@ jobs: - uses: actions/checkout@v4 - uses: graalvm/setup-graalvm@v1 with: - version: '22.3.2' - java-version: '17' + version: '23.0.1' + java-version: '21' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} - run: mvn -version From 843227411a4626501c97adeded8668a4f59e3bab Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 17 Jan 2025 13:32:31 -0500 Subject: [PATCH 2/7] Update ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e97e48ad11..84c1b9ea56 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -263,7 +263,7 @@ jobs: - uses: graalvm/setup-graalvm@v1 with: version: '23.0.1' - java-version: '21' + java-version: '23' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} - run: mvn -version From 739633f7802f4184ac66c1896ba8239f8b9412c0 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 17 Jan 2025 13:36:55 -0500 Subject: [PATCH 3/7] Update ci.yaml --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 84c1b9ea56..20641eadb2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -262,7 +262,6 @@ jobs: - uses: actions/checkout@v4 - uses: graalvm/setup-graalvm@v1 with: - version: '23.0.1' java-version: '23' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} From 0e537e4f50c66f494b00a3602aaea72569b9f638 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 17 Jan 2025 13:38:44 -0500 Subject: [PATCH 4/7] Update ci.yaml --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 20641eadb2..aab7b3700b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -263,7 +263,6 @@ jobs: - uses: graalvm/setup-graalvm@v1 with: java-version: '23' - components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} - run: mvn -version - run: native-image --version From 59806837c2ba483845f21be5485afa669792a336 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 17 Jan 2025 14:11:12 -0500 Subject: [PATCH 5/7] remove showcase-native, introduce CI for java 23 We remove showcase-native because it's already being [tested in Cloud Build](https://www.google.com/url?q=https://github.com/googleapis/sdk-platform-java/blob/09d9708dec7ef82f7d269c6285a9588dec48ac5d/.cloudbuild/graalvm/cloudbuild-test-a.yaml%23L45&sa=D&source=docs&ust=1737144190134588&usg=AOvVaw0VT7f-vqeGpoSEAKvWhwg9) --- .github/workflows/ci.yaml | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index aab7b3700b..6661ee46ac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - java: [ 11, 17] + java: [ 11, 17, 23] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 @@ -256,34 +256,6 @@ jobs: --batch-mode \ --no-transfer-progress - showcase-native: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: graalvm/setup-graalvm@v1 - with: - java-version: '23' - github-token: ${{ secrets.GITHUB_TOKEN }} - - run: mvn -version - - run: native-image --version - - name: Install sdk-platform-java - run: mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip - - name: Parse showcase version - working-directory: showcase/gapic-showcase - run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV" - - name: Install showcase server - run: | - sudo mkdir -p /usr/src/showcase - sudo chown -R ${USER} /usr/src/ - curl --location https://github.com/googleapis/gapic-showcase/releases/download/v${{env.SHOWCASE_VERSION}}/gapic-showcase-${{env.SHOWCASE_VERSION}}-linux-amd64.tar.gz --output /usr/src/showcase/showcase-${{env.SHOWCASE_VERSION}}-linux-amd64.tar.gz - cd /usr/src/showcase/ - tar -xf showcase-* - ./gapic-showcase run & - cd - - - name: Build native image - working-directory: showcase - run: mvn test -Pnative,-showcase -ntp -B - showcase-clirr: if: ${{ github.base_ref != '' }} # Only execute on pull_request trigger event runs-on: ubuntu-22.04 From f7fdd6d9cda6b6359f043d7c15ac165c4c03adc3 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 17 Jan 2025 14:47:16 -0500 Subject: [PATCH 6/7] Update ci.yaml Aborting upgrade to jdk 23 as showcase covers it --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6661ee46ac..2d5b237b5b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - java: [ 11, 17, 23] + java: [ 11, 17 ] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 From 55cfbfdacfda77b00458e09b1072ca941eae9fca Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 17 Jan 2025 14:47:51 -0500 Subject: [PATCH 7/7] Update ci.yaml whitespace --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2d5b237b5b..a6d335eccd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - java: [ 11, 17 ] + java: [ 11, 17] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4