Run the test tasks on different jobs and combine the results

This reduces the build time by about 2 hours!
ben-manes · May 22, 2022 · d8e8a30 · d8e8a30
1 parent 5d8a2fc
commit d8e8a30
Show file tree

Hide file tree

Showing 26 changed files with 376 additions and 330 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,3 +1,4 @@
+# Runs the test suite on arm64 to verify correctness on a weaker memory model compared to x86's
 version: 2.1
 
 parameters:
@@ -87,68 +88,78 @@ commands:
           cache_key: << parameters.cache_key >>
 
 jobs:
-  strong_keys:
+  compile:
     resource_class: arm.medium
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:current
     environment:
       JAVA_VERSION: << pipeline.parameters.java_version >>
       TERM: dumb
     steps:
       - run_tests:
-          cache_key: strong_keys
+          cache_key: compile
           test_steps:
             - run:
-                name: Run tests
+                name: Compile
                 no_output_timeout: 1h
-                command: ./.github/scripts/test.sh --caffeine=strongKeys
-            - run:
-                name: Stop Gradle daemon
-                when: always
-                command: ./gradlew --stop
-  weak_keys:
+                command: ./gradlew check -x test
+  test:
     resource_class: arm.medium
     machine:
-      image: ubuntu-2004:202101-01
-    environment:
-      JAVA_VERSION: << pipeline.parameters.java_version >>
-      TERM: dumb
-    steps:
-      - run_tests:
-          cache_key: weak_keys
-          test_steps:
-            - run:
-                name: Run tests
-                no_output_timeout: 1h
-                command: ./.github/scripts/test.sh --caffeine=weakKeys
-            - run:
-                name: Stop Gradle daemon
-                when: always
-                command: ./gradlew --stop
-  isolated:
-    resource_class: arm.medium
-    machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:current
     environment:
       JAVA_VERSION: << pipeline.parameters.java_version >>
       TERM: dumb
+    parameters:
+      task:
+        type: string
     steps:
       - run_tests:
-          cache_key: isolated
+          cache_key: << parameters.task >>
           test_steps:
             - run:
                 name: Run tests
                 no_output_timeout: 1h
-                command: ./.github/scripts/test.sh --caffeine=check
-            - run:
-                name: Stop Gradle daemon
-                when: always
-                command: ./gradlew --stop
+                command: ./gradlew << parameters.task >>
 
 workflows:
   version: 2
   workflow:
     jobs:
-      - strong_keys
-      - weak_keys
-      - isolated
+      - compile
+      - test:
+          requires: [compile]
+          matrix:
+            parameters:
+              task:
+                - caffeine:weakKeysAndStrongValuesStatsAsyncCaffeineSlowTest
+                - caffeine:weakKeysAndStrongValuesStatsSyncCaffeineSlowTest
+                - caffeine:strongKeysAndWeakValuesStatsSyncCaffeineSlowTest
+                - caffeine:strongKeysAndSoftValuesStatsSyncCaffeineSlowTest
+                - caffeine:strongKeysAndStrongValuesStatsAsyncCaffeineTest
+                - caffeine:weakKeysAndWeakValuesStatsSyncCaffeineSlowTest
+                - caffeine:weakKeysAndSoftValuesStatsSyncCaffeineSlowTest
+                - caffeine:strongKeysAndStrongValuesStatsSyncCaffeineTest
+                - caffeine:weakKeysAndStrongValuesStatsAsyncCaffeineTest
+                - caffeine:weakKeysAndStrongValuesStatsSyncCaffeineTest
+                - caffeine:weakKeysAndStrongValuesAsyncCaffeineSlowTest
+                - caffeine:strongKeysAndWeakValuesStatsSyncCaffeineTest
+                - caffeine:strongKeysAndSoftValuesStatsSyncCaffeineTest
+                - caffeine:weakKeysAndStrongValuesSyncCaffeineSlowTest
+                - caffeine:strongKeysAndWeakValuesSyncCaffeineSlowTest
+                - caffeine:strongKeysAndSoftValuesSyncCaffeineSlowTest
+                - caffeine:weakKeysAndWeakValuesStatsSyncCaffeineTest
+                - caffeine:weakKeysAndSoftValuesStatsSyncCaffeineTest
+                - caffeine:strongKeysAndStrongValuesAsyncCaffeineTest
+                - caffeine:weakKeysAndWeakValuesSyncCaffeineSlowTest
+                - caffeine:weakKeysAndSoftValuesSyncCaffeineSlowTest
+                - caffeine:strongKeysAndStrongValuesSyncCaffeineTest
+                - caffeine:weakKeysAndStrongValuesAsyncCaffeineTest
+                - caffeine:weakKeysAndStrongValuesSyncCaffeineTest
+                - caffeine:strongKeysAndWeakValuesSyncCaffeineTest
+                - caffeine:strongKeysAndSoftValuesSyncCaffeineTest
+                - caffeine:weakKeysAndWeakValuesSyncCaffeineTest
+                - caffeine:weakKeysAndSoftValuesSyncCaffeineTest
+                - caffeine:lincheckTest
+                - caffeine:isolatedTest
+                - caffeine:junitTest
diff --git a/.codecov b/.codecov
@@ -0,0 +1,2 @@
+coverage:
+  round: nearest
diff --git a/.github/scripts/test.sh b/.github/scripts/test.sh
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -3,6 +3,7 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
+  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
@@ -14,6 +15,10 @@ jobs:
     env:
       JAVA_VERSION: ${{ matrix.java }}
     steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@248ae51c2e8cc9622ecf50685c8bf7150c6e8813
+        with:
+          egress-policy: audit
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3