Update for Gradle 8.1 release

With Gradle 8.1, the configuration-cache has changed and is now stable. 
As a temporary measure, this commit disables save/restore of the configuration-cache
data to avoid issues until we can deal with this change properly.
This commit is contained in:
Daz DeBoer 2023-04-14 16:23:09 -06:00 committed by GitHub
parent 5056fa9d50
commit eb126d771e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 26 deletions

View File

@ -44,10 +44,10 @@ jobs:
with: with:
cache-key-prefix: ${{github.run_number}}- cache-key-prefix: ${{github.run_number}}-
restore-configuration-cache: # restore-configuration-cache:
uses: ./.github/workflows/integ-test-restore-configuration-cache.yml # uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
with: # with:
cache-key-prefix: ${{github.run_number}}- # cache-key-prefix: ${{github.run_number}}-
restore-custom-gradle-home: restore-custom-gradle-home:
uses: ./.github/workflows/integ-test-restore-custom-gradle-home.yml uses: ./.github/workflows/integ-test-restore-custom-gradle-home.yml

View File

@ -71,12 +71,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-containerized-gradle-home: restore-containerized-gradle-home:
needs: build-distribution needs: build-distribution

View File

@ -252,9 +252,10 @@ gradle-home-cache-includes: |
caches caches
notifications notifications
jdks jdks
# Exclude the local build-cache from the directories cached. # Exclude the local build-cache and keyrings from the directories cached.
gradle-home-cache-excludes: | gradle-home-cache-excludes: |
caches/build-cache-1 caches/build-cache-1
caches/keyrings
``` ```
You can specify any number of fixed paths or patterns to include or exclude. You can specify any number of fixed paths or patterns to include or exclude.

6
dist/main/index.js vendored
View File

@ -63664,7 +63664,6 @@ class GradleStateCache {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
yield this.debugReportGradleUserHomeSize('as restored from cache'); yield this.debugReportGradleUserHomeSize('as restored from cache');
yield new cache_extract_entries_1.GradleHomeEntryExtractor(this.gradleUserHome).restore(listener); yield new cache_extract_entries_1.GradleHomeEntryExtractor(this.gradleUserHome).restore(listener);
yield new cache_extract_entries_1.ConfigurationCacheEntryExtractor(this.gradleUserHome).restore(listener);
yield this.debugReportGradleUserHomeSize('after restoring common artifacts'); yield this.debugReportGradleUserHomeSize('after restoring common artifacts');
}); });
} }
@ -63703,8 +63702,7 @@ class GradleStateCache {
yield this.debugReportGradleUserHomeSize('before saving common artifacts'); yield this.debugReportGradleUserHomeSize('before saving common artifacts');
this.deleteExcludedPaths(); this.deleteExcludedPaths();
yield Promise.all([ yield Promise.all([
new cache_extract_entries_1.GradleHomeEntryExtractor(this.gradleUserHome).extract(listener), new cache_extract_entries_1.GradleHomeEntryExtractor(this.gradleUserHome).extract(listener)
new cache_extract_entries_1.ConfigurationCacheEntryExtractor(this.gradleUserHome).extract(listener)
]); ]);
yield this.debugReportGradleUserHomeSize("after extracting common artifacts (only 'caches' and 'notifications' will be stored)"); yield this.debugReportGradleUserHomeSize("after extracting common artifacts (only 'caches' and 'notifications' will be stored)");
}); });
@ -64449,7 +64447,7 @@ const exec = __importStar(__nccwpck_require__(1514));
const crypto = __importStar(__nccwpck_require__(6113)); const crypto = __importStar(__nccwpck_require__(6113));
const path = __importStar(__nccwpck_require__(1017)); const path = __importStar(__nccwpck_require__(1017));
const fs = __importStar(__nccwpck_require__(7147)); const fs = __importStar(__nccwpck_require__(7147));
const CACHE_PROTOCOL_VERSION = 'v6-'; const CACHE_PROTOCOL_VERSION = 'v7-';
const JOB_CONTEXT_PARAMETER = 'workflow-job-context'; const JOB_CONTEXT_PARAMETER = 'workflow-job-context';
const CACHE_DISABLED_PARAMETER = 'cache-disabled'; const CACHE_DISABLED_PARAMETER = 'cache-disabled';
const CACHE_READONLY_PARAMETER = 'cache-read-only'; const CACHE_READONLY_PARAMETER = 'cache-read-only';

File diff suppressed because one or more lines are too long

6
dist/post/index.js vendored
View File

@ -62715,7 +62715,6 @@ class GradleStateCache {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
yield this.debugReportGradleUserHomeSize('as restored from cache'); yield this.debugReportGradleUserHomeSize('as restored from cache');
yield new cache_extract_entries_1.GradleHomeEntryExtractor(this.gradleUserHome).restore(listener); yield new cache_extract_entries_1.GradleHomeEntryExtractor(this.gradleUserHome).restore(listener);
yield new cache_extract_entries_1.ConfigurationCacheEntryExtractor(this.gradleUserHome).restore(listener);
yield this.debugReportGradleUserHomeSize('after restoring common artifacts'); yield this.debugReportGradleUserHomeSize('after restoring common artifacts');
}); });
} }
@ -62754,8 +62753,7 @@ class GradleStateCache {
yield this.debugReportGradleUserHomeSize('before saving common artifacts'); yield this.debugReportGradleUserHomeSize('before saving common artifacts');
this.deleteExcludedPaths(); this.deleteExcludedPaths();
yield Promise.all([ yield Promise.all([
new cache_extract_entries_1.GradleHomeEntryExtractor(this.gradleUserHome).extract(listener), new cache_extract_entries_1.GradleHomeEntryExtractor(this.gradleUserHome).extract(listener)
new cache_extract_entries_1.ConfigurationCacheEntryExtractor(this.gradleUserHome).extract(listener)
]); ]);
yield this.debugReportGradleUserHomeSize("after extracting common artifacts (only 'caches' and 'notifications' will be stored)"); yield this.debugReportGradleUserHomeSize("after extracting common artifacts (only 'caches' and 'notifications' will be stored)");
}); });
@ -63500,7 +63498,7 @@ const exec = __importStar(__nccwpck_require__(1514));
const crypto = __importStar(__nccwpck_require__(6113)); const crypto = __importStar(__nccwpck_require__(6113));
const path = __importStar(__nccwpck_require__(1017)); const path = __importStar(__nccwpck_require__(1017));
const fs = __importStar(__nccwpck_require__(7147)); const fs = __importStar(__nccwpck_require__(7147));
const CACHE_PROTOCOL_VERSION = 'v6-'; const CACHE_PROTOCOL_VERSION = 'v7-';
const JOB_CONTEXT_PARAMETER = 'workflow-job-context'; const JOB_CONTEXT_PARAMETER = 'workflow-job-context';
const CACHE_DISABLED_PARAMETER = 'cache-disabled'; const CACHE_DISABLED_PARAMETER = 'cache-disabled';
const CACHE_READONLY_PARAMETER = 'cache-read-only'; const CACHE_READONLY_PARAMETER = 'cache-read-only';

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,7 @@ import path from 'path'
import fs from 'fs' import fs from 'fs'
import {CacheListener} from './cache-reporting' import {CacheListener} from './cache-reporting'
import {saveCache, restoreCache, cacheDebug, isCacheDebuggingEnabled, tryDelete, generateCacheKey} from './cache-utils' import {saveCache, restoreCache, cacheDebug, isCacheDebuggingEnabled, tryDelete, generateCacheKey} from './cache-utils'
import {ConfigurationCacheEntryExtractor, GradleHomeEntryExtractor} from './cache-extract-entries' import {GradleHomeEntryExtractor} from './cache-extract-entries'
const RESTORED_CACHE_KEY_KEY = 'restored-cache-key' const RESTORED_CACHE_KEY_KEY = 'restored-cache-key'
@ -80,7 +80,7 @@ export class GradleStateCache {
async afterRestore(listener: CacheListener): Promise<void> { async afterRestore(listener: CacheListener): Promise<void> {
await this.debugReportGradleUserHomeSize('as restored from cache') await this.debugReportGradleUserHomeSize('as restored from cache')
await new GradleHomeEntryExtractor(this.gradleUserHome).restore(listener) await new GradleHomeEntryExtractor(this.gradleUserHome).restore(listener)
await new ConfigurationCacheEntryExtractor(this.gradleUserHome).restore(listener) // await new ConfigurationCacheEntryExtractor(this.gradleUserHome).restore(listener)
await this.debugReportGradleUserHomeSize('after restoring common artifacts') await this.debugReportGradleUserHomeSize('after restoring common artifacts')
} }
@ -130,8 +130,8 @@ export class GradleStateCache {
await this.debugReportGradleUserHomeSize('before saving common artifacts') await this.debugReportGradleUserHomeSize('before saving common artifacts')
this.deleteExcludedPaths() this.deleteExcludedPaths()
await Promise.all([ await Promise.all([
new GradleHomeEntryExtractor(this.gradleUserHome).extract(listener), new GradleHomeEntryExtractor(this.gradleUserHome).extract(listener)
new ConfigurationCacheEntryExtractor(this.gradleUserHome).extract(listener) // new ConfigurationCacheEntryExtractor(this.gradleUserHome).extract(listener)
]) ])
await this.debugReportGradleUserHomeSize( await this.debugReportGradleUserHomeSize(
"after extracting common artifacts (only 'caches' and 'notifications' will be stored)" "after extracting common artifacts (only 'caches' and 'notifications' will be stored)"

View File

@ -9,7 +9,7 @@ import * as fs from 'fs'
import {CacheEntryListener} from './cache-reporting' import {CacheEntryListener} from './cache-reporting'
const CACHE_PROTOCOL_VERSION = 'v6-' const CACHE_PROTOCOL_VERSION = 'v7-'
const JOB_CONTEXT_PARAMETER = 'workflow-job-context' const JOB_CONTEXT_PARAMETER = 'workflow-job-context'
const CACHE_DISABLED_PARAMETER = 'cache-disabled' const CACHE_DISABLED_PARAMETER = 'cache-disabled'