Skip to content

Merge releases/v2 into releases/v1 #1071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrymercer merged 41 commits into from
May 11, 2022
Merged

Merge releases/v2 into releases/v1 #1071

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
0256599
Prompt customers to upgrade from v1 to v2
henrymercer Apr 26, 2022
016ec75
Update changelog and version after v2.1.9
invalid-email-address Apr 27, 2022
04f504c
Update checked-in dependencies
invalid-email-address Apr 27, 2022
6ed7f70
Merge pull request #1047 from github/mergeback/v2.1.9-to-main-7502d6e9
edoardopirovano Apr 28, 2022
5227afa
Tweak wording of message
henrymercer Apr 28, 2022
35ef6a2
Move `formatGitHubVersion` into util.test.ts
henrymercer Apr 28, 2022
02083c3
Add a comment to explain why we show the upgrade message on GHES 3.4
henrymercer Apr 28, 2022
2bf00f7
Merge branch 'main' into henrymercer/prompt-v1-to-v2-upgrades
henrymercer Apr 28, 2022
0c3c093
Merge pull request #1045 from github/henrymercer/prompt-v1-to-v2-upgr…
henrymercer Apr 28, 2022
7c2be06
Factor out test mode determination code
henrymercer Apr 28, 2022
ea676e3
Don't wait for processing in test mode
henrymercer Apr 28, 2022
06b15c2
Allow pack specifiers to include paths
aeisenberg Apr 27, 2022
ceeddf2
Merge pull request #1050 from github/henrymercer/dont-wait-for-proces…
henrymercer Apr 29, 2022
922dc2b
Use the `--resolve-query-specs` parameter of `pack download`
aeisenberg Apr 29, 2022
b11fe85
Merge branch 'main' into aeisenberg/packs-with-paths
aeisenberg Apr 29, 2022
a73e506
Fix syntax error in workflow
aeisenberg Apr 29, 2022
0235de0
Merge pull request #1049 from github/aeisenberg/packs-with-paths
aeisenberg May 2, 2022
9a6bf18
Update CONTRIBUTING.md
aeisenberg May 2, 2022
c9882be
Update CONTRIBUTING.md
aeisenberg May 2, 2022
8f84542
Merge pull request #1052 from github/aeisenberg/required-checks
aeisenberg May 2, 2022
b71f20d
Add workflow to regenerate required checks
aeisenberg May 2, 2022
0fb7838
Merge pull request #1053 from github/aeisenberg/update-checks
aeisenberg May 2, 2022
06d4e82
Add permissions block to workflow
aeisenberg May 2, 2022
7b66e72
Merge pull request #1054 from github/aeisenberg/update-checks
aeisenberg May 2, 2022
366e88c
Fix processing errors being caught and logged as a warning rather tha…
chrisgavin May 3, 2022
96bc9c3
Merge pull request #1055 from github/fix-status-error-being-caught
chrisgavin May 3, 2022
3c6dd30
Update codeql to 2.9.1
May 3, 2022
dd56e95
Merge pull request #1056 from github/alexet/update-2.9.1
May 5, 2022
827fd55
Create update-required-checks script
aeisenberg May 9, 2022
7cf0ed5
Merge pull request #1060 from github/aeisenberg/required-checks-script
aeisenberg May 10, 2022
f8eea91
Update changelog for v2.1.10
invalid-email-address May 10, 2022
75b4f1c
Merge pull request #1062 from github/update-v2.1.10-7cf0ed5e
May 10, 2022
3bb6c41
Remove an extraneous commit during the release process
henrymercer May 11, 2022
03e2e3c
Merge pull request #1065 from github/henrymercer/remove-extraneous-co…
henrymercer May 11, 2022
4e0668d
Fix integration tests on v1
henrymercer May 11, 2022
2f58583
Merge pull request #1069 from github/henrymercer/fix-integration-test…
henrymercer May 11, 2022
c1672e5
Revert "Update version and changelog for v1.1.9"
invalid-email-address May 11, 2022
93c2093
Revert "Update checked-in dependencies"
invalid-email-address May 11, 2022
ab69202
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.10…
invalid-email-address May 11, 2022
46d6a93
Update version and changelog for v1.1.10
invalid-email-address May 11, 2022
ec7fba1
Update checked-in dependencies
invalid-email-address May 11, 2022
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
10 changes: 7 additions & 3 deletions lib/analyze-action-env.test.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion lib/analyze-action-env.test.js.map
View file
Open in desktop

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

10 changes: 7 additions & 3 deletions lib/analyze-action-input.test.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion lib/analyze-action-input.test.js.map
View file
Open in desktop

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

10 changes: 7 additions & 3 deletions src/analyze-action-env.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@ setupTests(test);

test("analyze action with RAM & threads from environment variables", async (t) => {
await util.withTmpDir(async (tmpDir) => {
process.env["GITHUB_SERVER_URL"] = "fake-server-url";
process.env["GITHUB_REPOSITORY"] = "fake/repository";
process.env["GITHUB_SERVER_URL"] = util.GITHUB_DOTCOM_URL;
process.env["GITHUB_REPOSITORY"] = "github/codeql-action-fake-repository";
sinon
.stub(actionsUtil, "createStatusReportBase")
.resolves({} as actionsUtil.StatusReportBase);
sinon.stub(actionsUtil, "sendStatusReport").resolves(true);
const gitHubVersion: util.GitHubVersion = {
type: util.GitHubVariant.DOTCOM,
};
sinon.stub(configUtils, "getConfig").resolves({
gitHubVersion: { type: util.GitHubVariant.DOTCOM },
gitHubVersion,
languages: [],
packs: [],
} as unknown as configUtils.Config);
Expand All @@ -38,6 +41,7 @@ test("analyze action with RAM & threads from environment variables", async (t) =
requiredInputStub.withArgs("upload-database").returns("false");
const optionalInputStub = sinon.stub(actionsUtil, "getOptionalInput");
optionalInputStub.withArgs("cleanup-level").returns("none");
sinon.stub(util, "getGitHubVersion").resolves(gitHubVersion);
setupActionsVars(tmpDir, tmpDir);
mockFeatureFlagApiEndpoint(200, {});

Expand Down
10 changes: 7 additions & 3 deletions src/analyze-action-input.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@ setupTests(test);

test("analyze action with RAM & threads from action inputs", async (t) => {
await util.withTmpDir(async (tmpDir) => {
process.env["GITHUB_SERVER_URL"] = "fake-server-url";
process.env["GITHUB_REPOSITORY"] = "fake/repository";
process.env["GITHUB_SERVER_URL"] = util.GITHUB_DOTCOM_URL;
process.env["GITHUB_REPOSITORY"] = "github/codeql-action-fake-repository";
sinon
.stub(actionsUtil, "createStatusReportBase")
.resolves({} as actionsUtil.StatusReportBase);
sinon.stub(actionsUtil, "sendStatusReport").resolves(true);
const gitHubVersion: util.GitHubVersion = {
type: util.GitHubVariant.DOTCOM,
};
sinon.stub(configUtils, "getConfig").resolves({
gitHubVersion: { type: util.GitHubVariant.DOTCOM },
gitHubVersion,
languages: [],
packs: [],
} as unknown as configUtils.Config);
Expand All @@ -38,6 +41,7 @@ test("analyze action with RAM & threads from action inputs", async (t) => {
requiredInputStub.withArgs("upload-database").returns("false");
const optionalInputStub = sinon.stub(actionsUtil, "getOptionalInput");
optionalInputStub.withArgs("cleanup-level").returns("none");
sinon.stub(util, "getGitHubVersion").resolves(gitHubVersion);
setupActionsVars(tmpDir, tmpDir);
mockFeatureFlagApiEndpoint(200, {});

Expand Down