Add Timeout and split configCachedFunctionalTests

graalvm · Sep 7, 2023 · fdc8b81 · fdc8b81
1 parent c02c56a
commit fdc8b81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/test-native-gradle-plugin.yml b/.github/workflows/test-native-gradle-plugin.yml
@@ -41,10 +41,6 @@ jobs:
         id: set-matrix
         run: |
           ./gradlew :native-gradle-plugin:dumpFunctionalTestList
-      - name: "Print matrix"
-        run: |
-          echo "Matrix after populating: ${{ matrix }}
-          echo "Tests after populating: ${{ matrix.test }}
 
   test-native-gradle-plugin:
     name: "Sanity checks"
@@ -69,8 +65,9 @@ jobs:
           path: native-gradle-plugin/build/reports/tests/test/
 
   functional-testing-gradle-plugin:
-    name: "🧪 Functional testing ${{ matrix.test }} on ${{ matrix.os }} with gradle version: ${{ matrix.gradle-version }}"
+    name: "🧪 ${{ matrix.test }} on ${{ matrix.os }} with gradle version: ${{ matrix.gradle-version }}"
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     needs: populate-matrix
     strategy:
       fail-fast: false
@@ -85,7 +82,7 @@ jobs:
       - name: "❓ Check and test the plugin"
         run: ./gradlew :native-gradle-plugin:functionalTest -DgradleVersion=${{ matrix.gradle-version }} --tests ${{ matrix.test }}
       - name: "❓ Check and test the plugin with configuration cache"
-        run: ./gradlew :native-gradle-plugin:configCacheFunctionalTest -DgradleVersion=${{ matrix.gradle-config-cache-version }}
+        run: ./gradlew :native-gradle-plugin:configCacheFunctionalTest -DgradleVersion=${{ matrix.gradle-config-cache-version }}  --tests ${{ matrix.test }}
       - name: "📜 Upload functional tests results"
         if: always()
         uses: actions/upload-artifact@v2

diff --git a/.github/workflows/test-native-maven-plugin.yml b/.github/workflows/test-native-maven-plugin.yml
@@ -22,8 +22,8 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'graalvm/native-build-tools' }}
 
 jobs:
-  set-matrix:
-    name: "Set  matrix"
+  populate-matrix:
+    name: "Set matrix"
     runs-on: "ubuntu-20.04"
     timeout-minutes: 5
     outputs:
@@ -41,11 +41,13 @@ jobs:
         id: set-matrix
         run: |
           ./gradlew :native-maven-plugin:dumpFunctionalTestList
+
   test-native-maven-plugin:
     name: "Maven plugin tests"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
+      matrix: ${{fromJson(needs.populate-matrix.outputs.matrix)}}
     steps:
       - name: "☁️ Checkout repository"
         uses: actions/checkout@v3