Visitar URL original
Merge main into releases/v2 by github-actions[bot] · Pull Request #1669 · github/codeql-action · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ee44252
- Add new configuration Parameter
Mar 18, 2023
94786b3
update changelog
Mar 18, 2023
2f14134
fix linter issues
Mar 18, 2023
f81f527
Update README.md - typo
Mar 18, 2023
f1fb80a
Update README.md
Mar 18, 2023
34231cf
fix CI failure - check js
Mar 18, 2023
fe4a785
rename new parameter from configuration to config
tgrall Apr 1, 2023
18f1345
Merge branch 'main' into issue-1589-config-param
Apr 10, 2023
696504d
Accept change in PR
Apr 10, 2023
a9fb7d9
Update init/action.yml : PR review
Apr 10, 2023
d2950c1
Update README.md : during PR Review
Apr 10, 2023
c9f360d
Update README.md : during PR Review
Apr 10, 2023
0b75f47
Update CHANGELOG.md : during PR Review
Apr 10, 2023
b4e6f81
resolve comments from @henrymercer
tgrall Apr 10, 2023
fc374f5
remove the documentation about workflow parameters
tgrall Apr 10, 2023
f398a65
fix after review from @henrymercer
tgrall Apr 18, 2023
7b876ae
remove space from json string
tgrall Apr 18, 2023
47cec7a
add test with config file and input together
tgrall Apr 18, 2023
1cccbfc
Update changelog and version after v2.3.2
invalid-email-address Apr 27, 2023
e3395de
Update checked-in dependencies
invalid-email-address Apr 27, 2023
f31a31c
Merge pull request #1663 from github/mergeback/v2.3.2-to-main-f3feb00a
angelapwen Apr 27, 2023
824d18c
Merge remote-tracking branch 'upstream/main' into issue-1589-config-p…
aeisenberg Apr 28, 2023
234bada
Update default bundle to codeql-bundle-20230428
invalid-email-address May 1, 2023
40c9593
Add changelog note
invalid-email-address May 1, 2023
cba5616
Update CHANGELOG.md
aeisenberg May 1, 2023
d2f6dfd
Merge pull request #1665 from github/aeisenberg/config-param
aeisenberg May 1, 2023
b1b3d00
Add link to changenote for custom config
aeisenberg May 1, 2023
8ca5570
Merge pull request #1666 from github/aeisenberg/readme-update
aeisenberg May 1, 2023
3346195
Merge branch 'main' into update-bundle/codeql-bundle-20230428
May 3, 2023
f72bf5d
Fix workflow formatting
May 4, 2023
318bcc7
Merge pull request #1664 from github/update-bundle/codeql-bundle-2023…
May 4, 2023
140500d
Update changelog for v2.3.3
invalid-email-address May 4, 2023
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
fix linter issues
  • Loading branch information
Tugdual Grall
Tugdual Grall committed Mar 18, 2023
commit 2f141340f0623f1795dbd8926b101aba3dfb52e0
2 changes: 1 addition & 1 deletion lib/config-utils.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/config-utils.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/config-utils.test.js.map

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions src/config-utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -936,9 +936,7 @@ test("Queries can be specified in configuration, same as file", async (t) => {
- a/b@1.2.3
python:
- c/d@1.2.3
`;


`;

fs.mkdirSync(path.join(tmpDir, "foo"));

Expand Down Expand Up @@ -2757,5 +2755,3 @@ const mockRepositoryNwo = parseRepositoryNwo("owner/repo");
t.deepEqual(mockRequest.called, args.expectedApiCall);
});
});


7 changes: 4 additions & 3 deletions src/config-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1708,12 +1708,14 @@ export async function initConfig(

// if configuration is set, it takes precedence over configFile
if (configuration) {
const configFileToCreate = path.resolve(workspacePath, "user-config-from-action.yml");
const configFileToCreate = path.resolve(
workspacePath,
"user-config-from-action.yml"
);
fs.writeFileSync(configFileToCreate, configuration);
configFile = configFileToCreate;
logger.debug(`Using configuration from action input: ${configFile}`);
}


// If no config file was provided create an empty one
if (!configFile) {
Expand Down Expand Up @@ -1758,7 +1760,6 @@ export async function initConfig(
);
}


// When using the codescanning config in the CLI, pack downloads
// happen in the CLI during the `database init` command, so no need
// to download them here.
Expand Down