Merge remote-tracking branch 'origin/releases/v3' into backport-v2.26…

….8-574aaa581
github · Sep 19, 2024 · 3f0edd4 · 3f0edd4
2 parents 7aaea33 + 574aaa5
commit 3f0edd4
Show file tree

Hide file tree

Showing 94 changed files with 625 additions and 656 deletions.
diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml
@@ -115,24 +115,26 @@ jobs:
       SOURCE_BRANCH: ${{ needs.prepare.outputs.backport_source_branch }}
       TARGET_BRANCH: ${{ matrix.target_branch }}
     steps:
-    - uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4
+    - name: Generate token
+      uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4
       id: app-token
       with:
         app-id: ${{ vars.AUTOMATION_APP_ID }}
         private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
-    - uses: actions/checkout@v4
+
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0  # Need full history for calculation of diffs
+        token: ${{ steps.app-token.outputs.token }}
     - uses: ./.github/actions/release-initialise
 
     - name: Update older release branch
-      env:
-        GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
       run: |
         echo SOURCE_BRANCH=${SOURCE_BRANCH}
         echo TARGET_BRANCH=${TARGET_BRANCH}
         python .github/update-release-branch.py \
-          --github-token ${GITHUB_TOKEN} \
+          --github-token ${{ steps.app-token.outputs.token }} \
           --repository-nwo ${{ github.repository }} \
           --source-branch ${SOURCE_BRANCH} \
           --target-branch ${TARGET_BRANCH} \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.
 
+## 3.26.8 - 19 Sep 2024
+
+- Update default CodeQL bundle version to 2.19.0. [#2483](https://github.com/github/codeql-action/pull/2483)
+
 ## 3.26.7 - 13 Sep 2024
 
 - Update default CodeQL bundle version to 2.18.4. [#2471](https://github.com/github/codeql-action/pull/2471)

diff --git a/analyze/action.yml b/analyze/action.yml
@@ -74,7 +74,7 @@ inputs:
     required: true
     default: "true"
   token:
-    description: "GitHub token to use for authenticating with this instance of GitHub. The token needs the `security-events: write` permission."
+    description: "GitHub token to use for authenticating with this instance of GitHub. The token must be the built-in GitHub Actions token, and the workflow must have the `security-events: write` permission. Most of the time it is advisable to avoid specifying this input so that the workflow falls back to using the default value."
     required: false
     default: ${{ github.token }}
   matrix:

diff --git a/lib/analyze-action-post-helper.js b/lib/analyze-action-post-helper.js
diff --git a/lib/analyze-action-post-helper.js.map b/lib/analyze-action-post-helper.js.map
diff --git a/lib/analyze-action-post-helper.test.js b/lib/analyze-action-post-helper.test.js
diff --git a/lib/analyze-action-post-helper.test.js.map b/lib/analyze-action-post-helper.test.js.map
diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js
diff --git a/lib/analyze-action-post.js.map b/lib/analyze-action-post.js.map
diff --git a/lib/analyze-action.js b/lib/analyze-action.js