Update armeria workflow to follow the official repo CI job updates

gradle · Aug 14, 2024 · bca6f92 · bca6f92
1 parent 1911393
commit bca6f92
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/run-experiments-armeria.yml b/.github/workflows/run-experiments-armeria.yml
@@ -9,7 +9,7 @@ on:
 env:
   GRADLE_ENTERPRISE_URL: "https://ge.solutions-team.gradle.com"
   GIT_REPO: "https://github.com/line/armeria"
-  TASKS: "build -Pretry=true -PfailOnPassedAfterRetry=false -PnoLint -PflakyTests=false -PbuildJdkVersion=19 -PtestJavaVersion=19"
+  TASKS: "build -Pretry=true -PfailOnPassedAfterRetry=false -PnoLint -PflakyTests=false -PbuildJdkVersion=21 -PtestJavaVersion=21 -PpreferShadedTests=false"
 
 jobs:
   Experiment:
@@ -18,14 +18,15 @@ jobs:
       matrix:
         include:
           - experimentId: 1
-          - experimentId: 2
-          - experimentId: 3
+#          - experimentId: 2
+#          - experimentId: 3
     runs-on: ubuntu-latest
     steps:
-      - name: Set up JDK 19
+      - name: Set up JDK 21
+        id: setup-jdk
         uses: actions/setup-java@v4
         with:
-          java-version: 19
+          java-version: 21
           distribution: "temurin"
       - name: Download latest version of the validation scripts
         uses: gradle/gradle-enterprise-build-validation-scripts/.github/actions/gradle/download@actions-stable
@@ -37,7 +38,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: "${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}"
         with:
           gitRepo: ${{ env.GIT_REPO }}
-          tasks: ${{ env.TASKS }}
+          tasks: ${{ env.TASKS }} "-Porg.gradle.java.installations.paths=${{ steps.setup-jdk.outputs.path }}"
           gradleEnterpriseUrl: ${{ env.GRADLE_ENTERPRISE_URL }}
         if: matrix.experimentId == 1
       - name: Run experiment 2
@@ -46,7 +47,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: "${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}"
         with:
           gitRepo: ${{ env.GIT_REPO }}
-          tasks: ${{ env.TASKS }}
+          tasks: ${{ env.TASKS }} "-Porg.gradle.java.installations.paths=${{ steps.setup-jdk.outputs.path }}"
           gradleEnterpriseUrl: ${{ env.GRADLE_ENTERPRISE_URL }}
           failIfNotFullyCacheable: true
         if: matrix.experimentId == 2
@@ -56,7 +57,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: "${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}"
         with:
           gitRepo: ${{ env.GIT_REPO }}
-          tasks: ${{ env.TASKS }}
+          tasks: ${{ env.TASKS }} "-Porg.gradle.java.installations.paths=${{ steps.setup-jdk.outputs.path }}"
           gradleEnterpriseUrl: ${{ env.GRADLE_ENTERPRISE_URL }}
           failIfNotFullyCacheable: true
         if: matrix.experimentId == 3