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 main into releases/v2 #1972

Merged
merged 34 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
1e9b364
Update changelog and version after v2.22.4
github-actions[bot] Oct 20, 2023
64f799d
Update checked-in dependencies
github-actions[bot] Oct 20, 2023
a291b7c
Merge pull request #1962 from github/mergeback/v2.22.4-to-main-49abf0ba
dbartol Oct 20, 2023
d53a59d
C++: add deptrace pr-checks
redsun82 Oct 23, 2023
54e4af6
C++: fix autobuild pr-checks to latest codeql-cli version
redsun82 Oct 23, 2023
79817eb
Bump the npm group with 10 updates
dependabot[bot] Oct 23, 2023
9c3b394
Update checked-in dependencies
github-actions[bot] Oct 23, 2023
9734ecd
Bump the actions group with 1 update (#1965)
dependabot[bot] Oct 23, 2023
959337a
C++: fix autobuild pr-checks for macOS
redsun82 Oct 24, 2023
8779d91
Merge branch 'main' into redsun82/cpp-deptrace-pr-checks
redsun82 Oct 24, 2023
838be48
C++: tweak deptrace checks
redsun82 Oct 24, 2023
e3f5f83
Apply suggestions from code review
redsun82 Oct 25, 2023
f1b64d8
Sync PR checks
redsun82 Oct 25, 2023
dbe5586
Merge pull request #1966 from github/dependabot/npm_and_yarn/npm-0014…
henrymercer Oct 25, 2023
edb8265
Merge pull request #1964 from github/redsun82/cpp-deptrace-pr-checks
redsun82 Oct 25, 2023
2cbabea
Remove feature flag for analysis summary v2
henrymercer Oct 25, 2023
c8e9908
Remove feature flag for sub-language file coverage information
henrymercer Oct 25, 2023
d2b37ba
Remove feature flag for uploading failed SARIF
henrymercer Oct 25, 2023
5e3a693
Stub CodeQL version
henrymercer Oct 25, 2023
7f7aa09
Add pre-commit configuration
redsun82 Oct 26, 2023
dad0ebd
Merge pull request #1969 from github/redsun82/pre-commit
redsun82 Oct 26, 2023
25a3829
Fix comment
henrymercer Oct 26, 2023
06662f5
Validate workflow within new log group
henrymercer Oct 26, 2023
06d8f4f
Rename feature flag for evaluator fine-grained parallelism
nickrolfe Oct 11, 2023
4888104
Merge pull request #1940 from github/nickrolfe/rename_fgp_flag
nickrolfe Oct 26, 2023
3fc281e
Add workflow to rebuild the Action on a label
henrymercer Oct 26, 2023
c7abe9c
Merge pull request #1971 from github/henrymercer/bot-rebuild
henrymercer Oct 26, 2023
e8e83c3
Merge branch 'main' into henrymercer/enable-features-on-ghes
henrymercer Oct 26, 2023
95c2198
Add a log in the OK case
henrymercer Oct 26, 2023
f3b5586
Check out the right branch in `rebuild.yml`
henrymercer Oct 26, 2023
5744b13
Rebuild Action
henrymercer Oct 26, 2023
14d0fa9
Merge pull request #1967 from github/henrymercer/enable-features-on-ghes
henrymercer Oct 27, 2023
2d5ffa7
Merge pull request #1970 from github/henrymercer/clean-up-init-logs
henrymercer Oct 27, 2023
2ba6829
Update changelog for v2.22.5
github-actions[bot] Oct 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
78 changes: 78 additions & 0 deletions .github/workflows/__cpp-deptrace-disabled.yml

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

76 changes: 76 additions & 0 deletions .github/workflows/__cpp-deptrace-enabled-on-macos.yml

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

78 changes: 78 additions & 0 deletions .github/workflows/__cpp-deptrace-enabled.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/post-release-mergeback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: echo "${GITHUB_CONTEXT}"

- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4

- name: Update git config
run: |
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/rebuild.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Rebuild Action

on:
pull_request:
types: [labeled]

jobs:
rebuild:
name: Rebuild Action
runs-on: ubuntu-latest
if: github.event.label.name == 'Rebuild'

steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}

- name: Remove label
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
gh pr edit --repo github/codeql-action "$PR_NUMBER" \
--remove-label "Rebuild"

- name: Compile TypeScript
run: |
npm install
npm run lint -- --fix
npm run build

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.11

- name: Generate workflows
run: |
cd pr-checks
python -m pip install --upgrade pip
pip install ruamel.yaml==0.17.31
python3 sync.py

- name: Check for changes and push
env:
BRANCH: ${{ github.event.pull_request.head.ref }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
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 push origin "HEAD:$BRANCH"
echo "Pushed a commit to rebuild the Action." \
"Please mark the PR as ready for review to trigger PR checks." |
gh pr comment --body-file - --repo github/codeql-action "$PR_NUMBER"
gh pr ready --undo --repo github/codeql-action "$PR_NUMBER"
fi
20 changes: 20 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
repos:
- repo: local
hooks:
- 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
language: system
entry: python3 pr-checks/sync.py
pass_filenames: false
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.

## 2.22.5 - 27 Oct 2023

No user facing changes.

## 2.22.4 - 20 Oct 2023

- Update default CodeQL bundle version to 2.15.1. [#1953](https://github.com/github/codeql-action/pull/1953)
Expand Down
2 changes: 1 addition & 1 deletion lib/analyze.js

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