actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-11-04 08:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

try to run restore after the authentication

Browse source
This commit is contained in:
Kengo TODA 2021-07-14 20:23:49 +08:00
commit 6977c031ae
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dist/setup/index.js vendored
View file

@ -59781,7 +59781,6 @@ function run() {
if (!distribution) { if (!distribution) {
throw new Error(`No supported distribution was found for input ${distributionName}`); throw new Error(`No supported distribution was found for input ${distributionName}`);
} }
const restoreResult = cache ? cache_1.restore(cache) : Promise.resolve();
const result = yield distribution.setupJava(); const result = yield distribution.setupJava();
core.info(''); core.info('');
core.info('Java configuration:'); core.info('Java configuration:');
@ -59791,7 +59790,10 @@ function run() {
core.info(''); core.info('');
const matchersPath = path.join(__dirname, '..', '..', '.github'); const matchersPath = path.join(__dirname, '..', '..', '.github');
core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`); core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
yield Promise.all([restoreResult, auth.configureAuthentication()]); yield auth.configureAuthentication();
if (cache) {
yield cache_1.restore(cache);
}
} }
catch (error) { catch (error) {
core.setFailed(error.message); core.setFailed(error.message);

6
src/setup-java.ts
View file

@ -29,7 +29,6 @@ async function run() {
throw new Error(`No supported distribution was found for input ${distributionName}`); throw new Error(`No supported distribution was found for input ${distributionName}`);
} }
const restoreResult = cache ? restore(cache) : Promise.resolve();
const result = await distribution.setupJava(); const result = await distribution.setupJava();
core.info(''); core.info('');
@ -42,7 +41,10 @@ async function run() {
const matchersPath = path.join(__dirname, '..', '..', '.github'); const matchersPath = path.join(__dirname, '..', '..', '.github');
core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`); core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
await Promise.all([restoreResult, auth.configureAuthentication()]); await auth.configureAuthentication();
if (cache) {
await restore(cache);
}
} catch (error) { } catch (error) {
core.setFailed(error.message); core.setFailed(error.message);
} }