Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
476f13e
Upgrade Actions Tool Cache.
chrisgavin Jun 23, 2021
59560e5
Replace custom tool download method with the one in the tool cache li…
chrisgavin Jun 23, 2021
f5a5d3a
Update changelog and version after v1.0.3
invalid-email-address Jun 23, 2021
1496843
1.0.4
invalid-email-address Jun 23, 2021
e684c09
Merge pull request #587 from github/toolcache-upgrade
chrisgavin Jun 23, 2021
c98b431
Merge branch 'main' into mergeback/v1.0.3-to-main-cf6e0194
aeisenberg Jun 23, 2021
7729b51
Merge pull request #588 from github/mergeback/v1.0.3-to-main-cf6e0194
aeisenberg Jun 23, 2021
68b6873
Fix C# line counting and add test
edoardopirovano Jun 23, 2021
6e577cf
Add new `packs` input to init action
aeisenberg Jun 23, 2021
e38356b
Update lock file
aeisenberg Jun 23, 2021
c5434c9
Merge branch 'main' into csharp-loc
aeisenberg Jun 23, 2021
9f37000
Fix dependencies
aeisenberg Jun 23, 2021
ac402bf
Merge pull request #586 from edoardopirovano/csharp-loc
aeisenberg Jun 24, 2021
9200db3
Restore original getCodeQLActionRepository behaviour
Jun 24, 2021
26ade03
Just reverse test case
Jun 24, 2021
a1f71cf
Add Ruby to 'isInterpretedLanguage'
aibaars Jun 24, 2021
590c245
Merge pull request #593 from github/aibaars/ruby-is-interpreted
aibaars Jun 24, 2021
af32a29
Merge branch 'main' into simon-engledew/fix-runner-temp-missing
aeisenberg Jun 24, 2021
db80a9a
Merge pull request #594 from github/simon-engledew/fix-runner-temp-mi…
aeisenberg Jun 24, 2021
40852fa
Improve error messages from CLI invocations
edoardopirovano Jun 24, 2021
85ac9fe
Remove misleading comment.
edoardopirovano Jun 25, 2021
4087f37
Add extra integration test for packaging
aeisenberg Jun 24, 2021
67312df
Merge branch 'main' into aeisenberg/pack-in-inputs
aeisenberg Jun 25, 2021
7726ece
Merge pull request #591 from github/aeisenberg/pack-in-inputs
aeisenberg Jun 25, 2021
6017205
1.0.4
invalid-email-address Jun 28, 2021
440ccbd
Prepare CHANGELOG for 1.0.4
edoardopirovano Jun 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore original getCodeQLActionRepository behaviour
  • Loading branch information
Simon Engledew committed Jun 24, 2021
commit 9200db3ec4fbe1780e52054fa47401a75e7ca990
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/codeql.js

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

2 changes: 1 addition & 1 deletion lib/codeql.js.map

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions lib/codeql.test.js

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

2 changes: 1 addition & 1 deletion lib/codeql.test.js.map

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions src/codeql.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -374,19 +374,21 @@ test("getExtraOptions throws for bad content", (t) => {
test("getCodeQLActionRepository", (t) => {
const logger = getRunnerLogger(true);

process.env["RUNNER_TEMP"] = path.dirname(__dirname);

initializeEnvironment(Mode.actions, "1.2.3");
const repoActions = codeql.getCodeQLActionRepository(logger);
t.deepEqual(repoActions, "github/codeql-action");

process.env["GITHUB_ACTION_REPOSITORY"] = "xxx/yyy";
const repoEnv = codeql.getCodeQLActionRepository(logger);
t.deepEqual(repoEnv, "xxx/yyy");

initializeEnvironment(Mode.runner, "1.2.3");

// isRunningLocalAction() === true
delete process.env["GITHUB_ACTION_REPOSITORY"];
process.env["RUNNER_TEMP"] = path.dirname(__dirname);
const repoLocalRunner = codeql.getCodeQLActionRepository(logger);
t.deepEqual(repoLocalRunner, "github/codeql-action");

process.env["GITHUB_ACTION_REPOSITORY"] = "xxx/yyy";
const repoEnv = codeql.getCodeQLActionRepository(logger);
t.deepEqual(repoEnv, "xxx/yyy");
});
2 changes: 1 addition & 1 deletion src/codeql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down