Skip to content
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.

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

Merge releases/v3 into releases/v2 #2505

Merged
merged 36 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1afca05
Bump the npm group across 1 directory with 8 updates
dependabot[bot] Sep 16, 2024
6989ba7
Update checked-in dependencies
github-actions[bot] Sep 16, 2024
65efd22
Update changelog and version after v3.26.8
github-actions[bot] Sep 19, 2024
c38521e
Update checked-in dependencies
github-actions[bot] Sep 19, 2024
799e477
Merge pull request #2491 from github/mergeback/v3.26.8-to-main-294a9d92
smowton Sep 19, 2024
7513a95
Use workflow token for `update-release-branch.py`
rvermeulen Sep 19, 2024
a41f61f
Merge branch 'main' into rvermeulen/use-workflow-token
rvermeulen Sep 19, 2024
323f5ef
Merge pull request #2494 from github/rvermeulen/use-workflow-token
rvermeulen Sep 20, 2024
a7b6673
Run some tests against only `latest` and `nightly-latest` CLIs
henrymercer Sep 23, 2024
b78ab6c
s/latest/linked/
henrymercer Sep 23, 2024
f9ae1f1
Downgrade `eslint-plugin-import` for now
henrymercer Sep 23, 2024
ed5036d
Update `tsconfig.tsbuildinfo`
angelapwen Sep 23, 2024
bff5ba0
Check in new files when rebuilding
henrymercer Sep 23, 2024
74e989e
Stop tracking `tsconfig.tsbuildinfo`
angelapwen Sep 23, 2024
edf2ee9
Merge pull request #2496 from github/henrymercer/reduce-pr-check-load
henrymercer Sep 23, 2024
132b18f
Merge pull request #2497 from github/henrymercer/rebuild-add-new-files
henrymercer Sep 23, 2024
ef13051
Merge pull request #2484 from github/dependabot/npm_and_yarn/npm-f8fb…
angelapwen Sep 23, 2024
65e62c7
Bump the npm group with 4 updates
dependabot[bot] Sep 23, 2024
7a2719d
Update checked-in dependencies
github-actions[bot] Sep 23, 2024
b436a5f
Bump actions/create-github-app-token in the actions group
dependabot[bot] Sep 23, 2024
9580b7e
Avoid uploading eslint sarif for dependabot PR
aeisenberg Sep 23, 2024
6225a95
Don't upload during cancelled jobs
aeisenberg Sep 23, 2024
2cddcb1
Merge pull request #2499 from github/aeisenberg/no-upload-sarif
aeisenberg Sep 23, 2024
07fd497
Merge branch 'main' into dependabot/github_actions/actions-a88a8c5a24
aeisenberg Sep 23, 2024
6b0ce4e
revert eslint-plugin-import to 2.29.1
nickfyson Sep 23, 2024
e0a151e
Fix inconsistency in autobuild error tracking
henrymercer Sep 23, 2024
07e8133
Merge pull request #2501 from github/henrymercer/missing-autobuild-co…
henrymercer Sep 23, 2024
426821d
Merge pull request #2485 from github/dependabot/github_actions/action…
henrymercer Sep 23, 2024
f861efb
Merge pull request #2498 from github/dependabot/npm_and_yarn/npm-9874…
henrymercer Sep 24, 2024
00b1146
Update changelog for v3.26.9
github-actions[bot] Sep 24, 2024
461ef6c
Merge pull request #2503 from github/update-v3.26.9-f861efb2b
henrymercer Sep 24, 2024
6ea9546
Revert "Update version and changelog for v2.26.8"
github-actions[bot] Sep 24, 2024
9f0e9cc
Revert "Update checked-in dependencies"
github-actions[bot] Sep 24, 2024
0c7f114
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.26…
github-actions[bot] Sep 24, 2024
e092701
Update version and changelog for v2.26.9
github-actions[bot] Sep 24, 2024
a54d022
Update checked-in dependencies
github-actions[bot] Sep 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
44 changes: 0 additions & 44 deletions .github/workflows/__go-custom-queries.yml

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

44 changes: 0 additions & 44 deletions .github/workflows/__remote-config.yml

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

12 changes: 0 additions & 12 deletions .github/workflows/__unset-environment.yml

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

2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Upload sarif
uses: github/codeql-action/upload-sarif@v3
# Only upload SARIF for the latest version of Node.js
if: "always() && matrix.node-types-version == 'current'"
if: "!cancelled() && matrix.node-types-version == 'current' && !startsWith(github.head_ref, 'dependabot/')"
with:
sarif_file: eslint.sarif
category: eslint
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/rebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ jobs:
if [ ! -z "$(git status --porcelain)" ]; then
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
git commit -am "Rebuild"
git add --all
git commit -m "Rebuild"
git push origin "HEAD:$BRANCH"
echo "Pushed a commit to rebuild the Action." \
"Please mark the PR as ready for review to trigger PR checks." |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
TARGET_BRANCH: ${{ matrix.target_branch }}
steps:
- name: Generate token
uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69
id: app-token
with:
app-id: ${{ vars.AUTOMATION_APP_ID }}
Expand All @@ -134,7 +134,7 @@ jobs:
echo SOURCE_BRANCH=${SOURCE_BRANCH}
echo TARGET_BRANCH=${TARGET_BRANCH}
python .github/update-release-branch.py \
--github-token ${{ steps.app-token.outputs.token }} \
--github-token ${{ secrets.GITHUB_TOKEN }} \
--repository-nwo ${{ github.repository }} \
--source-branch ${SOURCE_BRANCH} \
--target-branch ${TARGET_BRANCH} \
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ node_modules/.cache/
.DS_Store
# eslint sarif report
eslint.sarif
# for local incremental compilation
tsconfig.tsbuildinfo
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th

Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.

## 2.26.9 - 24 Sep 2024

No user facing changes.

## 2.26.8 - 19 Sep 2024

- Update default CodeQL bundle version to 2.19.0. [#2483](https://github.com/github/codeql-action/pull/2483)
Expand Down
5 changes: 1 addition & 4 deletions 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.

Loading
Loading