Fix and re-enable test for save/restore config-cache

This commit is contained in:
Daz DeBoer 2022-05-29 15:13:03 -06:00
parent 5e6af67a5e
commit c13dc6c789
No known key found for this signature in database
GPG Key ID: DD6B9F0B06683D5D
2 changed files with 12 additions and 12 deletions

View File

@ -48,12 +48,12 @@ jobs:
runner-os: '["ubuntu-latest"]' runner-os: '["ubuntu-latest"]'
download-dist: true download-dist: true
# restore-configuration-cache: restore-configuration-cache:
# needs: build-distribution needs: build-distribution
# uses: ./.github/workflows/integ-test-restore-configuration-cache.yml uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
# with: with:
# runner-os: '["ubuntu-latest"]' runner-os: '["ubuntu-latest"]'
# download-dist: true download-dist: true
restore-custom-gradle-home: restore-custom-gradle-home:
needs: build-distribution needs: build-distribution

View File

@ -20,7 +20,7 @@ env:
jobs: jobs:
seed-build-groovy: seed-build-groovy:
env: env:
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-groovy
strategy: strategy:
matrix: matrix:
os: ${{fromJSON(inputs.runner-os)}} os: ${{fromJSON(inputs.runner-os)}}
@ -38,7 +38,7 @@ jobs:
verify-build-groovy: verify-build-groovy:
env: env:
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-groovy
needs: seed-build-groovy needs: seed-build-groovy
strategy: strategy:
matrix: matrix:
@ -67,7 +67,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
gradle-user-home-not-fully-restored: gradle-user-home-not-fully-restored:
env: env:
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-groovy
needs: seed-build-groovy needs: seed-build-groovy
strategy: strategy:
matrix: matrix:
@ -90,7 +90,7 @@ jobs:
seed-build-kotlin: seed-build-kotlin:
env: env:
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-kotlin
strategy: strategy:
matrix: matrix:
os: ${{fromJSON(inputs.runner-os)}} os: ${{fromJSON(inputs.runner-os)}}
@ -108,7 +108,7 @@ jobs:
modify-build-kotlin: modify-build-kotlin:
env: env:
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-kotlin-modified
needs: seed-build-kotlin needs: seed-build-kotlin
strategy: strategy:
matrix: matrix:
@ -128,7 +128,7 @@ jobs:
# Test restore configuration-cache from the third build invocation # Test restore configuration-cache from the third build invocation
verify-build-kotlin: verify-build-kotlin:
env: env:
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-kotlin-modified
needs: modify-build-kotlin needs: modify-build-kotlin
strategy: strategy:
matrix: matrix: