robojerk/codeql-action

Merge pull request #594 from github/simon-engledew/fix-runner-temp-missing

Browse source 
Restore original getCodeQLActionRepository behaviour
This commit is contained in:
Andrew Eisenberg 2021-06-24 13:58:42 -07:00 • committed by GitHub
commit db80a9a7c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -2,8 +2,7 @@
## [UNRELEASED]
No user facing changes.
- Fix `RUNNER_TEMP environment variable must be set` when using runner.
## 1.0.3 - 23 Jun 2021
No user facing changes.

2
lib/codeql.js generated
View file

@ -47,7 +47,7 @@ function getCodeQLBundleName() {
return `codeql-bundle-${platform}.tar.gz`;
}
function getCodeQLActionRepository(logger) {
if (util.isActions()) {
if (!util.isActions()) {
return CODEQL_DEFAULT_ACTION_REPOSITORY;
}
else {

2
lib/codeql.js.map
View file

File diff suppressed because one or more lines are too long

4
lib/codeql.test.js generated
View file

@ -192,10 +192,10 @@ ava_1.default("getExtraOptions throws for bad content", (t) => {
});
ava_1.default("getCodeQLActionRepository", (t) => {
const logger = logging_1.getRunnerLogger(true);
util_1.initializeEnvironment(util_1.Mode.actions, "1.2.3");
util_1.initializeEnvironment(util_1.Mode.runner, "1.2.3");
const repoActions = codeql.getCodeQLActionRepository(logger);
t.deepEqual(repoActions, "github/codeql-action");
util_1.initializeEnvironment(util_1.Mode.runner, "1.2.3");
util_1.initializeEnvironment(util_1.Mode.actions, "1.2.3");
// isRunningLocalAction() === true
delete process.env["GITHUB_ACTION_REPOSITORY"];
process.env["RUNNER_TEMP"] = path.dirname(__dirname);

2
lib/codeql.test.js.map
View file

File diff suppressed because one or more lines are too long

4
src/codeql.test.ts
View file

@ -374,11 +374,11 @@ test("getExtraOptions throws for bad content", (t) => {
test("getCodeQLActionRepository", (t) => {
const logger = getRunnerLogger(true);
initializeEnvironment(Mode.actions, "1.2.3");
initializeEnvironment(Mode.runner, "1.2.3");
const repoActions = codeql.getCodeQLActionRepository(logger);
t.deepEqual(repoActions, "github/codeql-action");
initializeEnvironment(Mode.runner, "1.2.3");
initializeEnvironment(Mode.actions, "1.2.3");
// isRunningLocalAction() === true
delete process.env["GITHUB_ACTION_REPOSITORY"];

2
src/codeql.ts
View file

@ -175,7 +175,7 @@ function getCodeQLBundleName(): string {
}
export function getCodeQLActionRepository(logger: Logger): string {
if (util.isActions()) {
if (!util.isActions()) {
return CODEQL_DEFAULT_ACTION_REPOSITORY;
} else {
return getActionsCodeQLActionRepository(logger);