mirror of
				https://github.com/gradle/gradle-build-action.git
				synced 2025-11-04 09:58:56 +08:00 
			
		
		
		
	Include github.run_attempt in test cache keys
This change to the integration tests should properly isolate multiple runs of the same job. Previously, some jobs would fail if you attempted to re-run them via the UI, because the cache entries would be re-used from the previous run.
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/failure-cases.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/failure-cases.yml
									
									
									
									
										vendored
									
									
								
							@@ -4,7 +4,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  action-inputs:
 | 
					  action-inputs:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 | 
					  GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,7 +14,7 @@ jobs:
 | 
				
			|||||||
  # These builds should start fresh without cache hits, due to the seed injected into the cache key above.
 | 
					  # These builds should start fresh without cache hits, due to the seed injected into the cache key above.
 | 
				
			||||||
  seed-build-groovy:
 | 
					  seed-build-groovy:
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-groovy-
 | 
					      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-groovy-
 | 
				
			||||||
    strategy:
 | 
					    strategy:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        os: [ubuntu-latest, windows-latest]
 | 
					        os: [ubuntu-latest, windows-latest]
 | 
				
			||||||
@@ -30,7 +30,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  configuration-cache-groovy:
 | 
					  configuration-cache-groovy:
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-groovy-
 | 
					      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-groovy-
 | 
				
			||||||
    needs: seed-build-groovy
 | 
					    needs: seed-build-groovy
 | 
				
			||||||
    strategy:
 | 
					    strategy:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
@@ -52,7 +52,7 @@ jobs:
 | 
				
			|||||||
  # Check that the build can run when no extracted cache entries are restored
 | 
					  # Check that the build can run when no extracted cache entries are restored
 | 
				
			||||||
  no-extracted-cache-entries-restored:
 | 
					  no-extracted-cache-entries-restored:
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-groovy-
 | 
					      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-groovy-
 | 
				
			||||||
    needs: seed-build-groovy
 | 
					    needs: seed-build-groovy
 | 
				
			||||||
    strategy:
 | 
					    strategy:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
@@ -73,7 +73,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  seed-build-kotlin:
 | 
					  seed-build-kotlin:
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-kotlin-
 | 
					      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-kotlin-
 | 
				
			||||||
    strategy:
 | 
					    strategy:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        os: [ubuntu-latest, windows-latest]
 | 
					        os: [ubuntu-latest, windows-latest]
 | 
				
			||||||
@@ -89,7 +89,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  modify-build-kotlin:
 | 
					  modify-build-kotlin:
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-kotlin-
 | 
					      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-kotlin-
 | 
				
			||||||
    needs: seed-build-kotlin
 | 
					    needs: seed-build-kotlin
 | 
				
			||||||
    strategy:
 | 
					    strategy:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
@@ -107,7 +107,7 @@ jobs:
 | 
				
			|||||||
 # Test restore configuration-cache from the third build invocation
 | 
					 # Test restore configuration-cache from the third build invocation
 | 
				
			||||||
  configuration-cache-kotlin:
 | 
					  configuration-cache-kotlin:
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-kotlin-
 | 
					      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-kotlin-
 | 
				
			||||||
    needs: modify-build-kotlin
 | 
					    needs: modify-build-kotlin
 | 
				
			||||||
    strategy:
 | 
					    strategy:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  seed-build:
 | 
					  seed-build:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  seed-build:
 | 
					  seed-build:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  seed-build:
 | 
					  seed-build:
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/integTest-execution.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/integTest-execution.yml
									
									
									
									
										vendored
									
									
								
							@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:   
 | 
					jobs:   
 | 
				
			||||||
  # Tests for executing with different Gradle versions. 
 | 
					  # Tests for executing with different Gradle versions. 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
  GRADLE_USER_HOME: ${{github.workspace}}/custom/gradle/home
 | 
					  GRADLE_USER_HOME: ${{github.workspace}}/custom/gradle/home
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:   
 | 
					jobs:   
 | 
				
			||||||
  # Tests for executing with different Gradle versions. 
 | 
					  # Tests for executing with different Gradle versions. 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 | 
					  GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ on:
 | 
				
			|||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}-
 | 
					  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{github.workflow}}#${{github.run_number}}:${{github.run_attempt}}-
 | 
				
			||||||
  GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 | 
					  GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user