Skip to content

Commit fb2e693

Browse files
bigdazgithub-actions[bot]
bigdaz
authored and
github-actions[bot]
committed
[bot] Update dist directory
1 parent 0719002 commit fb2e693

File tree

10 files changed

+36
-74
lines changed

10 files changed

+36
-74
lines changed

‎dist/dependency-submission/main/index.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157632,12 +157632,9 @@ const find = __importStar(__nccwpck_require__(849));
157632157632
const checksums = __importStar(__nccwpck_require__(50907));
157633157633
const hash = __importStar(__nccwpck_require__(60079));
157634157634
const path_1 = __nccwpck_require__(71017);
157635-
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
157635+
async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
157636157636
const wrapperJars = await find.findWrapperJars(gitRepoRoot);
157637157637
const result = new ValidationResult([], []);
157638-
if (wrapperJars.length < minWrapperCount) {
157639-
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
157640-
}
157641157638
if (wrapperJars.length > 0) {
157642157639
const notYetValidatedWrappers = [];
157643157640
for (const wrapperJar of wrapperJars) {
@@ -157670,23 +157667,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
157670157667
class ValidationResult {
157671157668
constructor(valid, invalid) {
157672157669
this.fetchedChecksums = false;
157673-
this.errors = [];
157674157670
this.valid = valid;
157675157671
this.invalid = invalid;
157676157672
}
157677157673
isValid() {
157678-
return this.invalid.length === 0 && this.errors.length === 0;
157674+
return this.invalid.length === 0;
157679157675
}
157680157676
toDisplayString() {
157681157677
let displayString = '';
157682157678
if (this.invalid.length > 0) {
157683157679
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
157684157680
}
157685-
if (this.errors.length > 0) {
157686-
if (displayString.length > 0)
157687-
displayString += '\n';
157688-
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
157689-
}
157690157681
if (this.valid.length > 0) {
157691157682
if (displayString.length > 0)
157692157683
displayString += '\n';
@@ -157754,16 +157745,16 @@ async function validateWrappers(config, workspaceRoot, gradleUserHome) {
157754157745
const checksumCache = new cache_1.ChecksumCache(gradleUserHome);
157755157746
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || [];
157756157747
const previouslyValidatedChecksums = checksumCache.load();
157757-
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, 0, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
157748+
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
157758157749
if (result.isValid()) {
157759157750
await core.group('All Gradle Wrapper jars are valid', async () => {
157760-
core.info(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
157751+
core.debug(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
157761157752
core.info(result.toDisplayString());
157762157753
});
157763157754
}
157764157755
else {
157765157756
core.info(result.toDisplayString());
157766-
throw new errors_1.JobFailure(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
157757+
throw new errors_1.JobFailure(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
157767157758
}
157768157759
checksumCache.save(result.valid.map(wrapper => wrapper.checksum));
157769157760
}

‎dist/dependency-submission/main/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/dependency-submission/post/index.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111256,12 +111256,9 @@ const find = __importStar(__nccwpck_require__(849));
111256111256
const checksums = __importStar(__nccwpck_require__(50907));
111257111257
const hash = __importStar(__nccwpck_require__(60079));
111258111258
const path_1 = __nccwpck_require__(71017);
111259-
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
111259+
async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
111260111260
const wrapperJars = await find.findWrapperJars(gitRepoRoot);
111261111261
const result = new ValidationResult([], []);
111262-
if (wrapperJars.length < minWrapperCount) {
111263-
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
111264-
}
111265111262
if (wrapperJars.length > 0) {
111266111263
const notYetValidatedWrappers = [];
111267111264
for (const wrapperJar of wrapperJars) {
@@ -111294,23 +111291,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
111294111291
class ValidationResult {
111295111292
constructor(valid, invalid) {
111296111293
this.fetchedChecksums = false;
111297-
this.errors = [];
111298111294
this.valid = valid;
111299111295
this.invalid = invalid;
111300111296
}
111301111297
isValid() {
111302-
return this.invalid.length === 0 && this.errors.length === 0;
111298+
return this.invalid.length === 0;
111303111299
}
111304111300
toDisplayString() {
111305111301
let displayString = '';
111306111302
if (this.invalid.length > 0) {
111307111303
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
111308111304
}
111309-
if (this.errors.length > 0) {
111310-
if (displayString.length > 0)
111311-
displayString += '\n';
111312-
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
111313-
}
111314111305
if (this.valid.length > 0) {
111315111306
if (displayString.length > 0)
111316111307
displayString += '\n';
@@ -111378,16 +111369,16 @@ async function validateWrappers(config, workspaceRoot, gradleUserHome) {
111378111369
const checksumCache = new cache_1.ChecksumCache(gradleUserHome);
111379111370
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || [];
111380111371
const previouslyValidatedChecksums = checksumCache.load();
111381-
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, 0, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
111372+
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
111382111373
if (result.isValid()) {
111383111374
await core.group('All Gradle Wrapper jars are valid', async () => {
111384-
core.info(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
111375+
core.debug(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
111385111376
core.info(result.toDisplayString());
111386111377
});
111387111378
}
111388111379
else {
111389111380
core.info(result.toDisplayString());
111390-
throw new errors_1.JobFailure(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
111381+
throw new errors_1.JobFailure(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
111391111382
}
111392111383
checksumCache.save(result.valid.map(wrapper => wrapper.checksum));
111393111384
}

‎dist/dependency-submission/post/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/setup-gradle/main/index.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157562,12 +157562,9 @@ const find = __importStar(__nccwpck_require__(849));
157562157562
const checksums = __importStar(__nccwpck_require__(50907));
157563157563
const hash = __importStar(__nccwpck_require__(60079));
157564157564
const path_1 = __nccwpck_require__(71017);
157565-
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
157565+
async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
157566157566
const wrapperJars = await find.findWrapperJars(gitRepoRoot);
157567157567
const result = new ValidationResult([], []);
157568-
if (wrapperJars.length < minWrapperCount) {
157569-
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
157570-
}
157571157568
if (wrapperJars.length > 0) {
157572157569
const notYetValidatedWrappers = [];
157573157570
for (const wrapperJar of wrapperJars) {
@@ -157600,23 +157597,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
157600157597
class ValidationResult {
157601157598
constructor(valid, invalid) {
157602157599
this.fetchedChecksums = false;
157603-
this.errors = [];
157604157600
this.valid = valid;
157605157601
this.invalid = invalid;
157606157602
}
157607157603
isValid() {
157608-
return this.invalid.length === 0 && this.errors.length === 0;
157604+
return this.invalid.length === 0;
157609157605
}
157610157606
toDisplayString() {
157611157607
let displayString = '';
157612157608
if (this.invalid.length > 0) {
157613157609
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
157614157610
}
157615-
if (this.errors.length > 0) {
157616-
if (displayString.length > 0)
157617-
displayString += '\n';
157618-
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
157619-
}
157620157611
if (this.valid.length > 0) {
157621157612
if (displayString.length > 0)
157622157613
displayString += '\n';
@@ -157684,16 +157675,16 @@ async function validateWrappers(config, workspaceRoot, gradleUserHome) {
157684157675
const checksumCache = new cache_1.ChecksumCache(gradleUserHome);
157685157676
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || [];
157686157677
const previouslyValidatedChecksums = checksumCache.load();
157687-
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, 0, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
157678+
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
157688157679
if (result.isValid()) {
157689157680
await core.group('All Gradle Wrapper jars are valid', async () => {
157690-
core.info(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
157681+
core.debug(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
157691157682
core.info(result.toDisplayString());
157692157683
});
157693157684
}
157694157685
else {
157695157686
core.info(result.toDisplayString());
157696-
throw new errors_1.JobFailure(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
157687+
throw new errors_1.JobFailure(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
157697157688
}
157698157689
checksumCache.save(result.valid.map(wrapper => wrapper.checksum));
157699157690
}

‎dist/setup-gradle/main/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/setup-gradle/post/index.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157557,12 +157557,9 @@ const find = __importStar(__nccwpck_require__(849));
157557157557
const checksums = __importStar(__nccwpck_require__(50907));
157558157558
const hash = __importStar(__nccwpck_require__(60079));
157559157559
const path_1 = __nccwpck_require__(71017);
157560-
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
157560+
async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
157561157561
const wrapperJars = await find.findWrapperJars(gitRepoRoot);
157562157562
const result = new ValidationResult([], []);
157563-
if (wrapperJars.length < minWrapperCount) {
157564-
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
157565-
}
157566157563
if (wrapperJars.length > 0) {
157567157564
const notYetValidatedWrappers = [];
157568157565
for (const wrapperJar of wrapperJars) {
@@ -157595,23 +157592,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
157595157592
class ValidationResult {
157596157593
constructor(valid, invalid) {
157597157594
this.fetchedChecksums = false;
157598-
this.errors = [];
157599157595
this.valid = valid;
157600157596
this.invalid = invalid;
157601157597
}
157602157598
isValid() {
157603-
return this.invalid.length === 0 && this.errors.length === 0;
157599+
return this.invalid.length === 0;
157604157600
}
157605157601
toDisplayString() {
157606157602
let displayString = '';
157607157603
if (this.invalid.length > 0) {
157608157604
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
157609157605
}
157610-
if (this.errors.length > 0) {
157611-
if (displayString.length > 0)
157612-
displayString += '\n';
157613-
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
157614-
}
157615157606
if (this.valid.length > 0) {
157616157607
if (displayString.length > 0)
157617157608
displayString += '\n';
@@ -157679,16 +157670,16 @@ async function validateWrappers(config, workspaceRoot, gradleUserHome) {
157679157670
const checksumCache = new cache_1.ChecksumCache(gradleUserHome);
157680157671
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || [];
157681157672
const previouslyValidatedChecksums = checksumCache.load();
157682-
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, 0, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
157673+
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
157683157674
if (result.isValid()) {
157684157675
await core.group('All Gradle Wrapper jars are valid', async () => {
157685-
core.info(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
157676+
core.debug(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
157686157677
core.info(result.toDisplayString());
157687157678
});
157688157679
}
157689157680
else {
157690157681
core.info(result.toDisplayString());
157691-
throw new errors_1.JobFailure(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
157682+
throw new errors_1.JobFailure(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
157692157683
}
157693157684
checksumCache.save(result.valid.map(wrapper => wrapper.checksum));
157694157685
}

‎dist/setup-gradle/post/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/wrapper-validation/main/index.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100928,12 +100928,19 @@ async function run() {
100928100928
(0, deprecation_collector_1.failOnUseOfRemovedFeature)('The action `gradle/wrapper-validation-action` has been replaced by `gradle/actions/wrapper-validation`');
100929100929
}
100930100930
(0, configuration_1.setActionId)('gradle/actions/wrapper-validation');
100931-
const result = await validate.findInvalidWrapperJars(path.resolve('.'), +core.getInput('min-wrapper-count'), core.getInput('allow-snapshots') === 'true', core.getInput('allow-checksums').split(','));
100931+
const result = await validate.findInvalidWrapperJars(path.resolve('.'), core.getInput('allow-snapshots') === 'true', core.getInput('allow-checksums').split(','));
100932100932
if (result.isValid()) {
100933100933
core.info(result.toDisplayString());
100934+
const minWrapperCount = +core.getInput('min-wrapper-count');
100935+
if (result.valid.length < minWrapperCount) {
100936+
const message = result.valid.length === 0
100937+
? 'Wrapper validation failed: no Gradle Wrapper jars found. Did you forget to checkout the repository?'
100938+
: `Wrapper validation failed: expected at least ${minWrapperCount} Gradle Wrapper jars, but found ${result.valid.length}.`;
100939+
core.setFailed(message);
100940+
}
100934100941
}
100935100942
else {
100936-
core.setFailed(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#reporting-failures\n${result.toDisplayString()}`);
100943+
core.setFailed(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
100937100944
if (result.invalid.length > 0) {
100938100945
core.setOutput('failed-wrapper', `${result.invalid.map(w => w.path).join('|')}`);
100939100946
}
@@ -101770,12 +101777,9 @@ const find = __importStar(__nccwpck_require__(849));
101770101777
const checksums = __importStar(__nccwpck_require__(907));
101771101778
const hash = __importStar(__nccwpck_require__(79));
101772101779
const path_1 = __nccwpck_require__(1017);
101773-
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
101780+
async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
101774101781
const wrapperJars = await find.findWrapperJars(gitRepoRoot);
101775101782
const result = new ValidationResult([], []);
101776-
if (wrapperJars.length < minWrapperCount) {
101777-
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
101778-
}
101779101783
if (wrapperJars.length > 0) {
101780101784
const notYetValidatedWrappers = [];
101781101785
for (const wrapperJar of wrapperJars) {
@@ -101808,23 +101812,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
101808101812
class ValidationResult {
101809101813
constructor(valid, invalid) {
101810101814
this.fetchedChecksums = false;
101811-
this.errors = [];
101812101815
this.valid = valid;
101813101816
this.invalid = invalid;
101814101817
}
101815101818
isValid() {
101816-
return this.invalid.length === 0 && this.errors.length === 0;
101819+
return this.invalid.length === 0;
101817101820
}
101818101821
toDisplayString() {
101819101822
let displayString = '';
101820101823
if (this.invalid.length > 0) {
101821101824
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
101822101825
}
101823-
if (this.errors.length > 0) {
101824-
if (displayString.length > 0)
101825-
displayString += '\n';
101826-
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
101827-
}
101828101826
if (this.valid.length > 0) {
101829101827
if (displayString.length > 0)
101830101828
displayString += '\n';

‎dist/wrapper-validation/main/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)