Skip to content

Merge main into releases/v3 #2798

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

Merged
merged 42 commits into from
Mar 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2923046
Update changelog and version after v3.28.10
github-actions[bot] Feb 21, 2025
5d1a3cb
Update checked-in dependencies
github-actions[bot] Feb 21, 2025
ff79de6
Merge pull request #2779 from github/mergeback/v3.28.10-to-main-b56ba49b
igfoo Feb 21, 2025
03c921e
Unify `token` description for `resolve-environment`, start-proxy`, an…
angelapwen Feb 24, 2025
d3c7d03
Merge pull request #2780 from github/angelapwen/fix-inconsistent-acti…
angelapwen Feb 24, 2025
286fd68
Use env var for `EXPECTED_CONFIG_FILE_CONTENTS`
angelapwen Feb 24, 2025
c0a8eb9
Use `$RUNNER_TEMP` for good measure
angelapwen Feb 24, 2025
5e88a17
Update .github/actions/check-codescanning-config/action.yml
angelapwen Feb 24, 2025
a9f7529
Quote `expected-config-file-contents` input
angelapwen Feb 24, 2025
7567eab
Fail when expected config does not exist
angelapwen Feb 24, 2025
3b348d9
Debug only: print environment variable
angelapwen Feb 24, 2025
e12eb8d
Set environment variable in the correct step
angelapwen Feb 24, 2025
628c1e6
Remove print debugging
angelapwen Feb 24, 2025
a8849fb
Merge pull request #2781 from github/angelapwen/fix-code-injection-wa…
angelapwen Feb 25, 2025
c4f2a07
PR Checks: use semantic versioning for `create-github-app-token`
angelapwen Feb 25, 2025
8c69433
Merge pull request #2782 from github/angelapwen/fix-unversioned-immut…
angelapwen Feb 25, 2025
32505c6
Warn about small amounts of MB, not GB
igfoo Feb 26, 2025
146dd5c
npm run build
igfoo Feb 26, 2025
0ae74e1
Check for running out of disk space
henrymercer Feb 20, 2025
d59d0eb
Add CLI error for failure to create temp directory
henrymercer Feb 20, 2025
97aac9b
Merge pull request #2785 from github/igfoo/mb
igfoo Feb 26, 2025
9663263
Do some just+pre-commit tweaking
redsun82 Feb 20, 2025
8392354
Merge pull request #2776 from github/redsun82/just
redsun82 Feb 27, 2025
85e30fe
Use embedded `actions` extractor only for old CLI versions
dbartol Feb 27, 2025
2db5b5a
Merge pull request #2786 from github/henrymercer/more-config-errors
henrymercer Mar 3, 2025
a8ade63
build(deps): bump the npm group with 9 updates
dependabot[bot] Mar 3, 2025
452ffd6
Update checked-in dependencies
github-actions[bot] Mar 3, 2025
1a69221
build(deps): bump actions/create-github-app-token in the actions group
dependabot[bot] Mar 3, 2025
4b35b04
Merge pull request #2792 from github/dependabot/github_actions/action…
angelapwen Mar 3, 2025
d37931a
Merge remote-tracking branch 'origin/main' into dbartol/use-real-acti…
dbartol Mar 3, 2025
f544ec5
Merge pull request #2791 from github/dependabot/npm_and_yarn/npm-24c2…
angelapwen Mar 3, 2025
80f9930
Merge pull request #2788 from github/dbartol/use-real-actions-extractor
dbartol Mar 3, 2025
b378daf
Update default bundle to codeql-bundle-v2.20.6
github-actions[bot] Mar 3, 2025
8dc01f6
Add changelog note
github-actions[bot] Mar 3, 2025
ec3b221
Update supported GitHub Enterprise Server versions
cklin Mar 3, 2025
35d04d3
Update supported GitHub Enterprise Server versions
github-actions[bot] Mar 5, 2025
608ccd6
Merge pull request #2794 from github/update-supported-enterprise-serv…
henrymercer Mar 5, 2025
7b7ed63
adjust string for handling rate limit error
nickfyson Mar 6, 2025
911d845
Merge pull request #2796 from github/nickfyson/adjust-rate-error-string
nickfyson Mar 6, 2025
256aa16
Merge branch 'main' into update-bundle/codeql-bundle-v2.20.6
cklin Mar 6, 2025
56b25d5
Merge pull request #2793 from github/update-bundle/codeql-bundle-v2.20.6
cklin Mar 6, 2025
6bca7dd
Update changelog for v3.28.11
github-actions[bot] Mar 7, 2025
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.
9 changes: 5 additions & 4 deletions .github/actions/check-codescanning-config/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ runs:
- name: Check config
working-directory: ${{ github.action_path }}
shell: bash
run: ts-node ./index.ts "${{ runner.temp }}/user-config.yaml" '${{ inputs.expected-config-file-contents }}'

env:
EXPECTED_CONFIG_FILE_CONTENTS: '${{ inputs.expected-config-file-contents }}'
run: ts-node ./index.ts "$RUNNER_TEMP/user-config.yaml" "$EXPECTED_CONFIG_FILE_CONTENTS"
- name: Clean up
shell: bash
if: always()
run: |
rm -rf ${{ runner.temp }}/codescanning-config-cli-test
rm -rf ${{ runner.temp }}/user-config.yaml
rm -rf $RUNNER_TEMP/codescanning-config-cli-test
rm -rf $RUNNER_TEMP/user-config.yaml
2 changes: 1 addition & 1 deletion .github/actions/check-codescanning-config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const actualConfig = loadActualConfig()

const rawExpectedConfig = process.argv[3].trim()
if (!rawExpectedConfig) {
core.info('No expected configuration provided')
core.setFailed('No expected configuration provided')
} else {
core.startGroup('Expected generated user config')
core.info(yaml.dump(JSON.parse(rawExpectedConfig)))
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-release-mergeback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ jobs:
--draft

- name: Generate token
uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2
uses: actions/create-github-app-token@v1.11.6
id: app-token
with:
app-id: ${{ vars.AUTOMATION_APP_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
pull-requests: write # needed to create pull request
steps:
- name: Generate token
uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2
uses: actions/create-github-app-token@v1.11.6
id: app-token
with:
app-id: ${{ vars.AUTOMATION_APP_ID }}
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
repos:
- repo: local
hooks:
- id: lint-ts
name: Lint typescript code
files: \.ts$
language: system
entry: npm run lint -- --fix
- id: compile-ts
name: Compile typescript
files: \.[tj]s$
language: system
entry: npm run build
pass_filenames: false
- id: lint-ts
name: Lint typescript code
files: \.ts$
language: system
entry: npm run lint -- --fix
- id: pr-checks-sync
name: Synchronize PR check workflows
files: ^.github/workflows/__.*\.yml$|^pr-checks
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.

## 3.28.11 - 07 Mar 2025

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

## 3.28.10 - 21 Feb 2025

- Update default CodeQL bundle version to 2.20.5. [#2772](https://github.com/github/codeql-action/pull/2772)
Expand Down
7 changes: 7 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Perform all working copy cleanup operations
all: lint sync

# Lint source typescript
lint:
npm run lint -- --fix

# Sync generated files (javascript and PR checks)
sync: build update-pr-checks

Expand Down
2 changes: 1 addition & 1 deletion lib/api-client.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/api-client.js.map

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

2 changes: 1 addition & 1 deletion lib/api-compatibility.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "maximumVersion": "3.16", "minimumVersion": "3.12" }
{ "maximumVersion": "3.17", "minimumVersion": "3.12" }
4 changes: 4 additions & 0 deletions lib/cli-errors.js

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

Loading
Loading