Skip to content

Commit

Permalink
Sec audit update
Browse files Browse the repository at this point in the history
Signed-off-by: Shelley Lambert <slambert@gmail.com>
  • Loading branch information
smlambert committed Jun 16, 2021
1 parent 8bc2c0f commit d76bb2a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
14 changes: 7 additions & 7 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2978,16 +2978,16 @@ function run() {
core.setFailed('Please provide jdkversion if jdksource is github-hosted installed or AdoptOpenJKD/install-jdk installed.');
}
if (vendorTestRepos !== '') {
vendorTestParams = `--vendor_repos ${vendorTestRepos}`;
vendorTestParams = `--vendor_repos ${vendorTestRepos}`;
}
if (vendorTestBranches !== '') {
vendorTestParams += ` --vendor_branches ${vendorTestBranches}`;
vendorTestParams += ` --vendor_branches ${vendorTestBranches}`;
}
if (vendorTestDirs !== '') {
vendorTestParams += ` --vendor_dirs ${vendorTestDirs}`;
vendorTestParams += ` --vendor_dirs ${vendorTestDirs}`;
}
if (vendorTestShas !== '') {
vendorTestParams += ` --vendor_shas ${vendorTestShas}`;
vendorTestParams += ` --vendor_shas ${vendorTestShas}`;
}
yield runaqa.runaqaTest(version, jdksource, buildList, target, customTarget, openjdktestRepo, openj9Repo, tkgRepo, vendorTestParams);
}
Expand Down Expand Up @@ -3403,13 +3403,13 @@ function runaqaTest(version, jdksource, buildList, target, customTarget, openjdk
//Get Dependencies, using /*zip*/dependents.zip to avoid loop every available files
let dependents = yield tc.downloadTool('https://ci.adoptopenjdk.net/view/all/job/test.getDependency/lastSuccessfulBuild/artifact//*zip*/dependents.zip');
// Test.dependency only has one level of archive directory, none of actions toolkit support mv files by regex. Using 7zip discards the directory directly
yield exec.exec(`7z e ${dependents} -o${process.env.GITHUB_WORKSPACE}/openjdk-tests/TKG/lib`);
yield exec.exec(`7z e ${dependents} -o${process.env.GITHUB_WORKSPACE}/aqa-tests/TKG/lib`);
if (buildList.includes('system')) {
dependents = yield tc.downloadTool('https://ci.adoptopenjdk.net/view/all/job/systemtest.getDependency/lastSuccessfulBuild/artifact/*zip*/dependents.zip');
// System.dependency has different levels of archive structures archive/systemtest_prereqs/*.*
// None of io.mv, io.cp and exec.exec can mv directories as expected (mv archive/ ./). Move subfolder systemtest_prereqs instead.
const dependentPath = yield tc.extractZip(dependents, `${process.env.GITHUB_WORKSPACE}/openjdk-tests`);
yield io.mv(`${dependentPath}/archive/systemtest_prereqs`, `${process.env.GITHUB_WORKSPACE}/openjdk-tests`);
const dependentPath = yield tc.extractZip(dependents, `${process.env.GITHUB_WORKSPACE}/`);
yield io.mv(`${dependentPath}/archive/systemtest_prereqs`, `${process.env.GITHUB_WORKSPACE}/aqa-tests`);
yield io.rmRF(`${dependentPath}/archive`);
}
const options = {};
Expand Down
12 changes: 9 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d76bb2a

Please sign in to comment.