Skip to content

Commit 461ef6c

Browse files
authored
Merge pull request #2503 from github/update-v3.26.9-f861efb2b
Merge main into releases/v3
2 parents 574aaa5 + 00b1146 commit 461ef6c

File tree

3,951 files changed

+53874
-131226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,951 files changed

+53874
-131226
lines changed

.github/workflows/__go-custom-queries.yml

-44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__remote-config.yml

-44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__unset-environment.yml

-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pr-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Upload sarif
3131
uses: github/codeql-action/upload-sarif@v3
3232
# Only upload SARIF for the latest version of Node.js
33-
if: "always() && matrix.node-types-version == 'current'"
33+
if: "!cancelled() && matrix.node-types-version == 'current' && !startsWith(github.head_ref, 'dependabot/')"
3434
with:
3535
sarif_file: eslint.sarif
3636
category: eslint

.github/workflows/rebuild.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ jobs:
6969
if [ ! -z "$(git status --porcelain)" ]; then
7070
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
7171
git config --global user.name "github-actions[bot]"
72-
git commit -am "Rebuild"
72+
git add --all
73+
git commit -m "Rebuild"
7374
git push origin "HEAD:$BRANCH"
7475
echo "Pushed a commit to rebuild the Action." \
7576
"Please mark the PR as ready for review to trigger PR checks." |

.github/workflows/update-release-branch.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
TARGET_BRANCH: ${{ matrix.target_branch }}
117117
steps:
118118
- name: Generate token
119-
uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4
119+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69
120120
id: app-token
121121
with:
122122
app-id: ${{ vars.AUTOMATION_APP_ID }}
@@ -134,7 +134,7 @@ jobs:
134134
echo SOURCE_BRANCH=${SOURCE_BRANCH}
135135
echo TARGET_BRANCH=${TARGET_BRANCH}
136136
python .github/update-release-branch.py \
137-
--github-token ${{ steps.app-token.outputs.token }} \
137+
--github-token ${{ secrets.GITHUB_TOKEN }} \
138138
--repository-nwo ${{ github.repository }} \
139139
--source-branch ${SOURCE_BRANCH} \
140140
--target-branch ${TARGET_BRANCH} \

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ node_modules/.cache/
77
.DS_Store
88
# eslint sarif report
99
eslint.sarif
10+
# for local incremental compilation
11+
tsconfig.tsbuildinfo

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
44

55
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.
66

7+
## 3.26.9 - 24 Sep 2024
8+
9+
No user facing changes.
10+
711
## 3.26.8 - 19 Sep 2024
812

913
- Update default CodeQL bundle version to 2.19.0. [#2483](https://github.com/github/codeql-action/pull/2483)

lib/codeql.js

+1-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)