adapt to exp5

jrhee17 · Jul 29, 2023 · 1a21a66 · 1a21a66
1 parent 30f5afd
commit 1a21a66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 39 deletions.
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -30,28 +30,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        on: [ self-hosted, macos-12, windows-latest ]
+        on: [ ubuntu-latest, macos-12, windows-latest ]
         java: [ 19 ]
-        include:
-          - java: 8
-            on: self-hosted
-          - java: 11
-            on: self-hosted
-          - java: 17
-            on: self-hosted
-            leak: true
-          - java: 17
-            on: self-hosted
-            min-java: 11
-          - java: 17
-            on: self-hosted
-            min-java: 17
-            coverage: true
-          - java: 19
-            on: self-hosted
-            snapshot: true
-            # blockhound makes the build run about 10 minutes slower
-            blockhound: true
 
     steps:
       - uses: actions/checkout@v2
@@ -74,28 +54,14 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
-      # Build the shaded JARs first so that shading process doesn't incur memory pressure
-      # on other Gradle tasks such as tests.
-      - name: Build with Gradle (Shading only)
-        run: |
-          ./gradlew --no-daemon --stacktrace clean shadedJar shadedTestJar trimShadedJar \
-          ${{ (matrix.on == 'self-hosted') && '--max-workers=8' || '--max-workers=2' }} --parallel \
-          ${{ matrix.coverage && '-Pcoverage' || '' }} \
-          -PnoLint -Dscan.tag.exp4 \
-          -PbuildJdkVersion=${{ env.BUILD_JDK_VERSION }} \
-          -PtestJavaVersion=${{ matrix.java }} \
-          ${{ matrix.min-java && format('-PminimumJavaVersion={0}', matrix.min-java) || '' }} \
-          -Porg.gradle.java.installations.paths=${{ steps.setup-build-jdk.outputs.path }},${{ steps.setup-jdk.outputs.path }}
-        shell: bash
-
       - name: Build with Gradle
         run: |
-          ./gradlew --no-daemon --stacktrace build \
+          ./gradlew --no-daemon --stacktrace clean build \
           ${{ (matrix.on == 'self-hosted') && '--max-workers=8' || '--max-workers=2' }} --parallel \
           ${{ matrix.coverage && '-Pcoverage' || '' }} \
           ${{ matrix.leak && '-Pleak' || '' }} \
           ${{ matrix.blockhound && '-Pblockhound' || '' }} \
-          -PnoLint -Dscan.tag.exp4 \
+          -Dscan.tag.exp5 \
           -PflakyTests=false \
           -Pretry=true \
           -PbuildJdkVersion=${{ env.BUILD_JDK_VERSION }} \

diff --git a/build.gradle b/build.gradle
@@ -113,7 +113,7 @@ allprojects {
         retry {
             if (rootProject.findProperty('retry') == 'true') {
                 maxRetries = 3
-                failOnPassedAfterRetry = true
+                failOnPassedAfterRetry = false
             }
         }
     }

diff --git a/settings.gradle b/settings.gradle
@@ -26,7 +26,7 @@ gradleEnterprise {
 buildCache {
     local { enabled = false }
     remote(HttpBuildCache) {
-        url = 'https://ge.armeria.dev/cache/exp4/'
+        url = 'https://ge.armeria.dev/cache/exp5/'
         credentials { creds ->
             creds.username = System.getenv('GRADLE_ENTERPRISE_CACHE_USERNAME')
             creds.password = System.getenv('GRADLE_ENTERPRISE_CACHE_PASSWORD')