Skip to content

Commit 7a5d495

Browse files
authored
Merge branch 'main' into lcartey/m5-0-20-pointers
2 parents d11f73a + b72ba4f commit 7a5d495

36 files changed

+1784
-564
lines changed

Diff for: .github/workflows/bump-version.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ jobs:
1818

1919
- name: Apply Bump
2020
shell: bash
21+
env:
22+
NEW_VERSION: ${{ inputs.new_version }}
2123
run: |
22-
bash ./scripts/bump_version.sh ${{ github.event.inputs.new_version }}
24+
bash ./scripts/release/bump-version.sh "$NEW_VERSION"
2325
2426
- name: Create Pull Request
2527
uses: peter-evans/create-pull-request@v4

Diff for: .github/workflows/code-scanning-pack-gen.yml

+22-11
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,48 @@ name: Code Scanning Query Pack Generation
22

33
on:
44
merge_group:
5+
types: [checks_requested]
56
pull_request:
67
branches:
78
- main
8-
- "rc/**"
99
- next
10+
- "rc/**"
1011

1112
push:
1213
branches:
1314
- main
14-
- "rc/**"
1515
- next
16+
- "rc/**"
1617

1718
env:
1819
XARGS_MAX_PROCS: 4
1920

2021
jobs:
22+
2123
prepare-code-scanning-pack-matrix:
2224
name: Prepare CodeQL Code Scanning pack matrix
2325
runs-on: ubuntu-22.04
2426
outputs:
2527
matrix: ${{ steps.export-code-scanning-pack-matrix.outputs.matrix }}
2628
steps:
2729
- name: Checkout repository
28-
uses: actions/checkout@v2
29-
30+
uses: actions/checkout@v4
3031
- name: Export Code Scanning pack matrix
3132
id: export-code-scanning-pack-matrix
3233
run: |
33-
echo "::set-output name=matrix::$(
34+
echo "matrix=$(
3435
jq --compact-output '.supported_environment | {include: .}' supported_codeql_configs.json
35-
)"
36+
)" >> $GITHUB_OUTPUT
3637
3738
create-code-scanning-pack:
3839
name: Create Code Scanning pack
3940
needs: prepare-code-scanning-pack-matrix
40-
runs-on: ubuntu-20.04-xl
41+
runs-on: ubuntu-latest-xl
4142
strategy:
4243
fail-fast: false
4344
matrix: ${{ fromJSON(needs.prepare-code-scanning-pack-matrix.outputs.matrix) }}
4445
steps:
45-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v4
4647

4748
- name: Cache CodeQL
4849
id: cache-codeql
@@ -65,18 +66,28 @@ jobs:
6566
with:
6667
cli_path: ${{ github.workspace }}/codeql_home/codeql
6768

69+
- name: Determine ref for external help files
70+
id: determine-ref
71+
run: |
72+
if [[ $GITHUB_EVENT_NAME == "pull_request" || $GITHUB_EVENT_NAME == "merge_group" ]]; then
73+
echo "EXTERNAL_HELP_REF=$GITHUB_HEAD_REF" >> "$GITHUB_ENV"
74+
else
75+
echo "EXTERNAL_HELP_REF=$GITHUB_REF" >> "$GITHUB_ENV"
76+
fi
77+
echo "Using ref $EXTERNAL_HELP_REF for external help files."
78+
6879
- name: Checkout external help files
6980
continue-on-error: true
7081
id: checkout-external-help-files
71-
uses: actions/checkout@v2
82+
uses: actions/checkout@v4
7283
with:
7384
ssh-key: ${{ secrets.CODEQL_CODING_STANDARDS_HELP_KEY }}
7485
repository: "github/codeql-coding-standards-help"
75-
ref: ${{ github.head_ref }}
86+
ref: ${{ env.EXTERNAL_HELP_REF }}
7687
path: external-help-files
7788

7889
- name: Include external help files
79-
if: ${{ steps.checkout-external-help-files.outcome == 'success' }}
90+
if: steps.checkout-external-help-files.outcome == 'success'
8091
run: |
8192
pushd external-help-files
8293
find . -name '*.md' -exec rsync -av --relative {} "$GITHUB_WORKSPACE" \;

Diff for: .github/workflows/codeql_unit_tests.yml

+17-14
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,37 @@ name: CodeQL Unit Testing
22

33
on:
44
merge_group:
5+
types: [checks_requested]
56
push:
67
branches:
78
- main
8-
- "rc/**"
99
- next
10+
- "rc/**"
1011
pull_request:
1112
branches:
12-
- "**"
13-
workflow_dispatch:
13+
- main
14+
- next
15+
- "rc/**"
1416

1517
jobs:
18+
1619
prepare-unit-test-matrix:
1720
name: Prepare CodeQL unit test matrix
1821
runs-on: ubuntu-22.04
1922
outputs:
2023
matrix: ${{ steps.export-unit-test-matrix.outputs.matrix }}
2124
steps:
2225
- name: Checkout repository
23-
uses: actions/checkout@v2
26+
uses: actions/checkout@v4
2427

2528
- name: Export unit test matrix
2629
id: export-unit-test-matrix
2730
run: |
2831
echo "Merging Result:"
2932
python scripts/create_language_matrix.py
30-
echo "::set-output name=matrix::$(
33+
echo "matrix=$(
3134
python scripts/create_language_matrix.py | \
32-
jq --compact-output 'map([.+{os: "ubuntu-20.04-xl", codeql_standard_library_ident : .codeql_standard_library | sub("\/"; "_")}]) | flatten | {include: .}')"
35+
jq --compact-output 'map([.+{os: "ubuntu-latest-xl", codeql_standard_library_ident : .codeql_standard_library | sub("\/"; "_")}]) | flatten | {include: .}')" >> $GITHUB_OUTPUT
3336
3437
run-test-suites:
3538
name: Run unit tests
@@ -39,22 +42,22 @@ jobs:
3942
strategy:
4043
fail-fast: false
4144
matrix: ${{ fromJSON(needs.prepare-unit-test-matrix.outputs.matrix) }}
42-
45+
4346
steps:
4447
- name: Checkout repository
45-
uses: actions/checkout@v2
48+
uses: actions/checkout@v4
4649

4750
- name: Install Python
4851
uses: actions/setup-python@v4
4952
with:
5053
python-version: "3.9"
51-
54+
5255
- name: Install Python dependencies
5356
run: pip install -r scripts/requirements.txt
5457

5558
- name: Cache CodeQL
5659
id: cache-codeql
57-
uses: actions/cache@v2.1.3
60+
uses: actions/cache@v3
5861
with:
5962
# A list of files, directories, and wildcard patterns to cache and restore
6063
path: ${{github.workspace}}/codeql_home
@@ -101,7 +104,7 @@ jobs:
101104
102105
def print_error(fmt, *args):
103106
print(f"::error::{fmt}", *args)
104-
107+
105108
def print_error_and_fail(fmt, *args):
106109
print_error(fmt, args)
107110
sys.exit(1)
@@ -148,7 +151,7 @@ jobs:
148151
file.close()
149152
150153
- name: Upload test results
151-
uses: actions/upload-artifact@v2
154+
uses: actions/upload-artifact@v3
152155
with:
153156
name: ${{ matrix.language }}-test-results-${{ runner.os }}-${{ matrix.codeql_cli }}-${{ matrix.codeql_standard_library_ident }}
154157
path: |
@@ -157,11 +160,11 @@ jobs:
157160

158161
validate-test-results:
159162
name: Validate test results
160-
needs: [run-test-suites]
163+
needs: run-test-suites
161164
runs-on: ubuntu-22.04
162165
steps:
163166
- name: Collect test results
164-
uses: actions/download-artifact@v2
167+
uses: actions/download-artifact@v3
165168

166169
- name: Validate test results
167170
run: |

Diff for: .github/workflows/create-draft-release.yml

-56
This file was deleted.

Diff for: .github/workflows/dispatch-matrix-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ on:
99

1010
jobs:
1111
dispatch-matrix-check:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-22.04
1313
steps:
1414

1515
- name: Test Variables
1616
shell: pwsh
17-
run: |
17+
run: |
1818
Write-Host "Running as: ${{github.actor}}"
1919
2020
- name: Dispatch Matrix Testing Job

Diff for: .github/workflows/dispatch-matrix-test-on-comment.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ on:
1111

1212
jobs:
1313
dispatch-matrix-check:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1515
steps:
1616

1717
- name: Test Variables
1818
shell: pwsh
19-
run: |
19+
run: |
2020
Write-Host "Running as: ${{github.actor}}"
2121
2222
$actor = "${{github.actor}}"

Diff for: .github/workflows/dispatch-release-performance-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ on:
1010

1111
jobs:
1212
dispatch-matrix-check:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-22.04
1414
steps:
1515

1616
- name: Test Variables
1717
shell: pwsh
18-
run: |
18+
run: |
1919
Write-Host "Running as: ${{github.actor}}"
2020
2121
$actor = "${{github.actor}}"

Diff for: .github/workflows/extra-rule-validation.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: ⚙️ Extra Rule Validation
22

33
on:
44
merge_group:
5+
types: [checks_requested]
56
push:
67
branches:
78
- main

0 commit comments

Comments
 (0)