From bdd89aa34fcadd12bd1e55267cf43d170b39f5f4 Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Mon, 27 Sep 2021 19:33:22 -0600
Subject: [PATCH] Refactored workflows

- Improve workflow names
- Split execution testing from cache testing
---
 .github/workflows/dev.yml                     |  3 +-
 .github/workflows/failure-cases.yml           |  4 +-
 ...tion-testing.yml => integTest-caching.yml} | 39 +----------------
 .github/workflows/integTest-execution.yml     | 42 +++++++++++++++++++
 ...otlin-dsl.yml => integTest-kotlin-dsl.yml} |  3 +-
 5 files changed, 46 insertions(+), 45 deletions(-)
 rename .github/workflows/{integration-testing.yml => integTest-caching.yml} (65%)
 create mode 100644 .github/workflows/integTest-execution.yml
 rename .github/workflows/{integration-testing-kotlin-dsl.yml => integTest-kotlin-dsl.yml} (89%)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 425e539..a402529 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -1,5 +1,4 @@
-# make sure the build works and doesn't produce spurious changes
-name: dev
+name: Verify generated outputs
 
 on:
   pull_request:
diff --git a/.github/workflows/failure-cases.yml b/.github/workflows/failure-cases.yml
index 9565917..5250469 100644
--- a/.github/workflows/failure-cases.yml
+++ b/.github/workflows/failure-cases.yml
@@ -1,6 +1,4 @@
- # Run builds under certain failure conditions to allow the output to be manually inspected.
-# These build invocations are informational only, and are expected to fail
-name: failure-cases
+name: Execute failure cases
 
 on:
   pull_request:
diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integTest-caching.yml
similarity index 65%
rename from .github/workflows/integration-testing.yml
rename to .github/workflows/integTest-caching.yml
index 90d8951..a7c9827 100644
--- a/.github/workflows/integration-testing.yml
+++ b/.github/workflows/integTest-caching.yml
@@ -1,5 +1,4 @@
- # Verify the functionality works as expected
-name: integration-testing
+name: Test caching
 
 on:
   pull_request:
@@ -30,42 +29,6 @@ jobs:
       with:
         build-root-directory: __tests__/samples/basic
         arguments: test --configuration-cache
-   
-  # Tests for executing with different Gradle versions. 
-  # Each build verifies that it is executed with the expected Gradle version.
-  gradle-execution:
-    needs: seed-build
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        include:
-          - os: windows-latest
-            script-suffix: '.bat'
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v2
-    - name: Test use defined Gradle version
-      uses: ./
-      with:
-        gradle-version: 6.9
-        build-root-directory: __tests__/samples/no-wrapper
-        arguments: help -DgradleVersionCheck=6.9
-        cache-read-only: true
-    - name: Test use Gradle version alias
-      uses: ./
-      with:
-        gradle-version: release-candidate
-        build-root-directory: __tests__/samples/no-wrapper
-        arguments: help -DgradleVersionCheck=7.2
-        cache-read-only: true
-    - name: Test use defined Gradle executable
-      uses: ./
-      with:
-        gradle-executable: __tests__/samples/basic/gradlew${{ matrix.script-suffix }}
-        build-root-directory: __tests__/samples/no-wrapper
-        arguments: help -DgradleVersionCheck=7.1.1
-        cache-read-only: true
 
   # Test that the gradle-user-home cache will cache dependencies, by running build with --offline
   dependencies-cache:
diff --git a/.github/workflows/integTest-execution.yml b/.github/workflows/integTest-execution.yml
new file mode 100644
index 0000000..3d3c445
--- /dev/null
+++ b/.github/workflows/integTest-execution.yml
@@ -0,0 +1,42 @@
+name: Test Gradle execution
+
+on:
+  pull_request:
+  push:
+  workflow_dispatch:
+
+env:
+  CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
+
+jobs:   
+  # Tests for executing with different Gradle versions. 
+  # Each build verifies that it is executed with the expected Gradle version.
+  gradle-execution:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          - os: windows-latest
+            script-suffix: '.bat'
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v2
+    - name: Test use defined Gradle version
+      uses: ./
+      with:
+        gradle-version: 6.9
+        build-root-directory: __tests__/samples/no-wrapper
+        arguments: help -DgradleVersionCheck=6.9
+    - name: Test use Gradle version alias
+      uses: ./
+      with:
+        gradle-version: release-candidate
+        build-root-directory: __tests__/samples/no-wrapper
+        arguments: help -DgradleVersionCheck=7.2
+    - name: Test use defined Gradle executable
+      uses: ./
+      with:
+        gradle-executable: __tests__/samples/basic/gradlew${{ matrix.script-suffix }}
+        build-root-directory: __tests__/samples/no-wrapper
+        arguments: help -DgradleVersionCheck=7.1.1
\ No newline at end of file
diff --git a/.github/workflows/integration-testing-kotlin-dsl.yml b/.github/workflows/integTest-kotlin-dsl.yml
similarity index 89%
rename from .github/workflows/integration-testing-kotlin-dsl.yml
rename to .github/workflows/integTest-kotlin-dsl.yml
index 6c05c15..0dba943 100644
--- a/.github/workflows/integration-testing-kotlin-dsl.yml
+++ b/.github/workflows/integTest-kotlin-dsl.yml
@@ -1,5 +1,4 @@
- # Make sure the action works on a clean machine without building
-name: integration-testing-kotlin-dsl
+name: Test caching with Kotlin DSL
 
 on:
   pull_request: