Skip to content

Merge main into releases/v2 #1706

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
aeisenberg merged 26 commits into from
May 25, 2023
Merged

Merge main into releases/v2 #1706

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
3100e1e
move check to calling function
May 24, 2023
dddabd0
add rebuilt lib
May 24, 2023
153cab0
jsdoc for fixInvalidNotificationsInFile
May 24, 2023
636b9ea
add rebuilt lib
May 24, 2023
0962265
Merge branch 'main' into fixInvalidNotifications-shortcut
henrymercer May 24, 2023
8f9b20b
Clarify how to update workflows
jsoref May 24, 2023
dba4f66
Grant security-events: write permissions
jsoref May 23, 2023
59d27da
Update changelog and version after v2.3.4
invalid-email-address May 24, 2023
1319d54
Update checked-in dependencies
invalid-email-address May 24, 2023
11ea309
Merge pull request #1701 from github/mergeback/v2.3.4-to-main-f0e3dfb3
angelapwen May 24, 2023
5f061ca
Merge pull request #1697 from github/fixInvalidNotifications-shortcut
henrymercer May 25, 2023
3da4cbf
Fix GitHub Actions email
henrymercer May 25, 2023
a5879b7
Tolerate forks of github/codeql-action
jsoref May 23, 2023
789f65c
Improving handling of uploadFailedSarifResult -> [Object object]
jsoref May 23, 2023
cc5f2fb
Gracefully handle decodeURIComponent failure
jsoref May 23, 2023
1023a08
Merge pull request #1694 from jsoref/fixes
henrymercer May 25, 2023
41499f5
Merge pull request #1702 from github/henrymercer/update-github-action…
henrymercer May 25, 2023
4a409ac
Link to CONTRIBUTING doc from README
henrymercer May 25, 2023
50bc388
Update Node version
henrymercer May 25, 2023
8d7f61b
Update npm version
henrymercer May 25, 2023
3912995
Merge pull request #1704 from github/henrymercer/contributions-updates
henrymercer May 25, 2023
9c5706e
Avoid throwing validation error on invalid URIs
aeisenberg May 25, 2023
42add7b
Update changelog
aeisenberg May 25, 2023
d3314cc
Merge pull request #1705 from github/aeisenberg/location-uri-schema-fix
aeisenberg May 25, 2023
ff82fd0
Update changelog for v2.3.5
github-actions[bot] May 25, 2023
15f9b00
Apply suggestions from code review
aeisenberg May 25, 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
Tolerate forks of github/codeql-action
  • Loading branch information
@jsoref
jsoref committed May 25, 2023
commit a5879b7b6ed801f2c9946fea8aa377f8a6e68d21
4 changes: 3 additions & 1 deletion lib/workflow.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/workflow.js.map
View file
Open in desktop

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

8 changes: 6 additions & 2 deletions src/workflow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as yaml from "js-yaml";

import * as api from "./api-client";
import { Logger } from "./logging";
import { getRequiredEnvParam } from "./util";
import { getRequiredEnvParam, isInTestMode } from "./util";

export interface WorkflowJobStep {
name?: string;
Expand Down Expand Up @@ -389,7 +389,11 @@ function getInputOrThrow(
* This allows us to test workflow parsing functionality as a CodeQL Action PR check.
*/
function getAnalyzeActionName() {
if (getRequiredEnvParam("GITHUB_REPOSITORY") === "github/codeql-action") {
if (
isInTestMode() ||
process.env["CODEQL_ACTION_TESTING_ENVIRONMENT"] ===
"codeql-action-pr-checks"
) {
return "./analyze";
} else {
return "github/codeql-action/analyze";
Expand Down