Skip to content

Commit 95e58e9

Browse files
authored
Merge pull request #3824 from github/update-v4.35.2-d2e135a73
Merge main into releases/v4
2 parents c10b806 + 6f31bfe commit 95e58e9

Some content is hidden

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

66 files changed

+129069
-127968
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
version: 2
22
updates:
33
- package-ecosystem: npm
4-
directory: "/"
4+
directories:
5+
- "/"
6+
- "/pr-checks"
57
schedule:
68
interval: weekly
79
cooldown:

.github/workflows/__language-aliases.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__rubocop-multi-language.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__start-proxy.yml

Lines changed: 18 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/debug-artifacts-failure-safe.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
uses: ./../action/.github/actions/verify-debug-artifact-scan-completed
6767
- uses: ./../action/init
6868
with:
69+
languages: cpp,csharp,go,java,javascript,python
6970
tools: ${{ steps.prepare-test.outputs.tools-url }}
7071
debug: true
7172
debug-artifact-name: my-debug-artifacts

.github/workflows/post-release-mergeback.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ defaults:
2424

2525
jobs:
2626
merge-back:
27-
runs-on: ubuntu-slim
27+
runs-on: ubuntu-latest
2828
environment: Automation
2929
if: github.repository == 'github/codeql-action'
3030
env:
@@ -131,7 +131,7 @@ jobs:
131131
echo "::endgroup::"
132132
133133
- name: Generate token
134-
uses: actions/create-github-app-token@v3.0.0
134+
uses: actions/create-github-app-token@v3.1.1
135135
id: app-token
136136
with:
137137
app-id: ${{ vars.AUTOMATION_APP_ID }}

.github/workflows/prepare-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ defaults:
2929
jobs:
3030
prepare:
3131
name: "Prepare release"
32-
runs-on: ubuntu-slim
32+
runs-on: ubuntu-latest
3333
if: github.repository == 'github/codeql-action'
3434

3535
permissions:

.github/workflows/rollback-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
137137
- name: Generate token
138138
if: github.event_name == 'workflow_dispatch'
139-
uses: actions/create-github-app-token@v3.0.0
139+
uses: actions/create-github-app-token@v3.1.1
140140
id: app-token
141141
with:
142142
app-id: ${{ vars.AUTOMATION_APP_ID }}

.github/workflows/update-bundle.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ defaults:
2020
jobs:
2121
update-bundle:
2222
if: github.event.release.prerelease && startsWith(github.event.release.tag_name, 'codeql-bundle-')
23-
runs-on: ubuntu-slim
23+
runs-on: ubuntu-latest
2424
permissions:
2525
contents: write # needed to push commits
2626
pull-requests: write # needed to create pull requests
@@ -57,6 +57,20 @@ jobs:
5757
- name: Update bundle
5858
uses: ./.github/actions/update-bundle
5959

60+
- name: Set up CodeQL CLI from new bundle
61+
id: setup-codeql
62+
uses: ./setup-codeql
63+
with:
64+
tools: https://github.com/github/codeql-action/releases/download/${{ github.event.release.tag_name }}/codeql-bundle-linux64.tar.gz
65+
66+
- name: Update language aliases
67+
env:
68+
CODEQL_PATH: ${{ steps.setup-codeql.outputs.codeql-path }}
69+
run: |
70+
"$CODEQL_PATH" resolve languages --format=betterjson --extractor-include-aliases \
71+
| jq -S '.aliases // {}' \
72+
> src/known-language-aliases.json
73+
6074
- name: Bump Action minor version if new CodeQL minor version series
6175
id: bump-action-version
6276
run: |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
update:
2828
timeout-minutes: 45
29-
runs-on: ubuntu-slim
29+
runs-on: ubuntu-latest
3030
if: github.event_name == 'workflow_dispatch'
3131
needs: [prepare]
3232
env:
@@ -77,7 +77,7 @@ jobs:
7777
7878
backport:
7979
timeout-minutes: 45
80-
runs-on: ubuntu-slim
80+
runs-on: ubuntu-latest
8181
environment: Automation
8282
needs: [prepare]
8383
if: ${{ (github.event_name == 'push') && needs.prepare.outputs.backport_target_branches != '[]' }}
@@ -93,7 +93,7 @@ jobs:
9393
pull-requests: write # needed to create pull request
9494
steps:
9595
- name: Generate token
96-
uses: actions/create-github-app-token@v3.0.0
96+
uses: actions/create-github-app-token@v3.1.1
9797
id: app-token
9898
with:
9999
app-id: ${{ vars.AUTOMATION_APP_ID }}

0 commit comments

Comments
 (0)