Skip to content

Commit da2d380

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/fast-xml-parser-5.12.1
2 parents 0c7ad84 + b4de9cd commit da2d380

7 files changed

Lines changed: 180 additions & 137 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
paths-ignore:
2+
- lib
3+
- tests
4+
queries:
5+
- uses: security-and-quality
Lines changed: 28 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/codeql.yml‎

Lines changed: 7 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -19,69 +19,16 @@ env:
1919
CODEQL_ACTION_TESTING_ENVIRONMENT: codeql-action-pr-checks
2020

2121
jobs:
22-
# Identify the CodeQL tool versions to use in the analysis job.
23-
check-codeql-versions:
22+
analyze:
2423
if: github.triggering_actor != 'dependabot[bot]'
2524
runs-on: ubuntu-26.04
26-
outputs:
27-
versions: ${{ steps.compare.outputs.versions }}
2825

29-
permissions:
30-
contents: read
31-
# We currently need `security-events: read` to access feature flags.
32-
security-events: read
33-
34-
steps:
35-
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
36-
- name: Set up default CodeQL bundle
37-
id: setup-default
38-
uses: ./setup-codeql
39-
- name: Set up linked CodeQL bundle
40-
id: setup-linked
41-
uses: ./setup-codeql
42-
with:
43-
tools: linked
44-
- name: Compare default and linked CodeQL bundle versions
45-
id: compare
46-
env:
47-
CODEQL_DEFAULT: ${{ steps.setup-default.outputs.codeql-path }}
48-
CODEQL_LINKED: ${{ steps.setup-linked.outputs.codeql-path }}
49-
run: |
50-
CODEQL_VERSION_DEFAULT="$("$CODEQL_DEFAULT" version --format terse)"
51-
CODEQL_VERSION_LINKED="$("$CODEQL_LINKED" version --format terse)"
52-
echo "Default CodeQL bundle version is $CODEQL_VERSION_DEFAULT"
53-
echo "Linked CodeQL bundle version is $CODEQL_VERSION_LINKED"
54-
55-
# If we're running on a pull request, run with both bundles, even if `tools: linked` would
56-
# be the same as `tools: null`. This allows us to make the job for each of the bundles a
57-
# required status check.
58-
#
59-
# If we're running on push or schedule, then we can skip running with `tools: linked` when it would be
60-
# the same as running with `tools: null`.
61-
if [[ "$GITHUB_EVENT_NAME" != "pull_request" && "$GITHUB_EVENT_NAME" != "merge_group" && "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LINKED" ]]; then
62-
VERSIONS_JSON='[null]'
63-
else
64-
VERSIONS_JSON='[null, "linked"]'
65-
fi
66-
67-
# Output a JSON-encoded list with the distinct versions to test against.
68-
echo "Suggested matrix config for analysis job: $VERSIONS_JSON"
69-
echo "versions=${VERSIONS_JSON}" >> $GITHUB_OUTPUT
70-
71-
analyze-javascript:
72-
if: github.triggering_actor != 'dependabot[bot]'
73-
needs: [check-codeql-versions]
7426
strategy:
7527
fail-fast: false
7628
matrix:
77-
os:
78-
- ubuntu-22.04
79-
- ubuntu-24.04
80-
- windows-2022
81-
- windows-2025
82-
- macos-15-xlarge
83-
tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
84-
runs-on: ${{ matrix.os }}
29+
language:
30+
- actions
31+
- javascript
8532

8633
permissions:
8734
contents: read
@@ -94,49 +41,15 @@ jobs:
9441
uses: ./init
9542
id: init
9643
with:
97-
languages: javascript
98-
config-file: ./.github/codeql/codeql-config-javascript.yml
99-
tools: ${{ matrix.tools }}
44+
languages: ${{ matrix.language }}
45+
build-mode: none
46+
config-file: ./.github/codeql/codeql-config-${{ matrix.language }}.yml
10047
# confirm steps.init.outputs.codeql-path points to the codeql binary
10148
- name: Print CodeQL Version
10249
run: >
10350
"$CODEQL" version --format=json
10451
env:
10552
CODEQL: ${{steps.init.outputs.codeql-path}}
106-
- name: Perform CodeQL Analysis
107-
uses: ./analyze
108-
with:
109-
category: "/language:javascript"
110-
upload: ${{ (matrix.os == 'ubuntu-24.04' && !matrix.tools && github.event_name != 'merge_group' && 'always' ) || 'never' }}
111-
112-
analyze-other:
113-
if: github.triggering_actor != 'dependabot[bot]'
114-
runs-on: ubuntu-26.04
115-
116-
strategy:
117-
fail-fast: false
118-
matrix:
119-
include:
120-
- language: actions
121-
122-
permissions:
123-
contents: read
124-
security-events: write
125-
126-
steps:
127-
- name: Checkout
128-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
129-
- name: Initialize CodeQL
130-
uses: ./init
131-
with:
132-
languages: ${{ matrix.language }}
133-
build-mode: none
134-
config: >
135-
paths-ignore:
136-
- lib
137-
- tests
138-
queries:
139-
- uses: security-and-quality
14053
- name: Perform CodeQL Analysis
14154
uses: ./analyze
14255
with:

‎.github/workflows/deflake.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ on:
6060
- "PR Check - Remote config file"
6161
- "PR Check - Resolve environment"
6262
- "PR Check - Ruby analysis"
63+
- "PR Check - Runner images"
6364
- "PR Check - Rust analysis"
6465
- "PR Check - Split workflow"
6566
- "PR Check - Start proxy"

‎.github/workflows/pr-checks.yml‎

Lines changed: 73 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ jobs:
9595
contents: read
9696
runs-on: ubuntu-26.04
9797
timeout-minutes: 10
98+
outputs:
99+
changelog-modified: ${{ steps.changelog-check.outputs.modified }}
98100

99101
concurrency:
100102
cancel-in-progress: ${{ github.event_name == 'pull_request' || false }}
@@ -191,6 +193,20 @@ jobs:
191193
path: ${{ runner.temp }}/repo-size/
192194
if-no-files-found: error
193195

196+
- name: Check for CHANGELOG.md changes
197+
id: changelog-check
198+
if: steps.fetch-base.outcome == 'success'
199+
env:
200+
BASE_SHA: ${{ steps.fetch-base.outputs.merge_base }}
201+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
202+
run: |
203+
if ! git diff --exit-code --quiet "$BASE_SHA" "$HEAD_SHA" -- CHANGELOG.md; then
204+
echo "CHANGELOG.md was modified in this PR."
205+
echo "modified=true" >> "$GITHUB_OUTPUT"
206+
else
207+
echo "modified=false" >> "$GITHUB_OUTPUT"
208+
fi
209+
194210
- name: "Backport: Check out base ref"
195211
id: checkout-base
196212
if: ${{ startsWith(github.head_ref, 'backport-') }}
@@ -211,8 +227,8 @@ jobs:
211227
exit 1
212228
fi
213229
214-
post-repo-size-comment:
215-
name: Post repo size comment
230+
post-pr-comments:
231+
name: Post PR comments
216232
needs: other-checks
217233
# Keep write permissions isolated from the job that checks out and tests PR code. This job only
218234
# posts the candidate comment body produced by the read-only `pr-checks` job.
@@ -232,6 +248,22 @@ jobs:
232248
group: check-repo-size-${{ github.event.pull_request.number }}
233249

234250
steps:
251+
- name: Checkout repository
252+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
253+
with:
254+
# Check out main, not the PR's head, since this job runs with
255+
# `pull-requests: write` permissions and must not execute untrusted code from the PR.
256+
ref: main
257+
258+
- name: Set up Node.js
259+
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
260+
with:
261+
node-version: 24
262+
cache: "npm"
263+
264+
- name: Install dependencies
265+
run: npm ci --workspace=pr-checks --include-workspace-root
266+
235267
- name: Download repo size comment
236268
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
237269
with:
@@ -261,3 +293,42 @@ jobs:
261293
else
262294
echo "Skipping repo size comment because the delta is below the threshold and no sticky comment exists."
263295
fi
296+
297+
- name: Post a warning about modifying CHANGELOG.md
298+
# Release, backport, mergeback, and bundle-update PRs deliberately modify CHANGELOG.md,
299+
# so skip comment management entirely for these automation flows.
300+
if: >-
301+
needs.other-checks.outputs.changelog-modified == 'true' &&
302+
!startsWith(github.event.pull_request.head.ref, 'update-v') &&
303+
!startsWith(github.event.pull_request.head.ref, 'backport-v') &&
304+
!startsWith(github.event.pull_request.head.ref, 'mergeback/') &&
305+
!startsWith(github.event.pull_request.head.ref, 'update-bundle/')
306+
uses: ./.github/actions/post-comment
307+
with:
308+
marker: "post-comment:CHANGELOG.md"
309+
body: |
310+
⚠️ `CHANGELOG.md` has been modified in this PR. Please do not modify `CHANGELOG.md` directly.
311+
Instead, create a change-note file in `unreleased-change-notes/`. The `CHANGELOG.md`
312+
file will be automatically generated from those change-notes.
313+
See [`unreleased-change-notes/README.md`](https://github.com/github/codeql-action/blob/main/unreleased-change-notes/README.md) for more information.
314+
token: ${{ secrets.GITHUB_TOKEN }}
315+
316+
- name: Mark the CHANGELOG.md concern as resolved
317+
if: >-
318+
needs.other-checks.outputs.changelog-modified == 'false' &&
319+
!startsWith(github.event.pull_request.head.ref, 'update-v') &&
320+
!startsWith(github.event.pull_request.head.ref, 'backport-v') &&
321+
!startsWith(github.event.pull_request.head.ref, 'mergeback/') &&
322+
!startsWith(github.event.pull_request.head.ref, 'update-bundle/')
323+
uses: ./.github/actions/post-comment
324+
with:
325+
marker: "post-comment:CHANGELOG.md"
326+
update-only: true
327+
body: |
328+
⚠️ `CHANGELOG.md` has been modified in this PR. Please do not modify `CHANGELOG.md` directly.
329+
Instead, create a change-note file in `unreleased-change-notes/`. The `CHANGELOG.md`
330+
file will be automatically generated from those change-notes.
331+
See [`unreleased-change-notes/README.md`](https://github.com/github/codeql-action/blob/main/unreleased-change-notes/README.md) for more information.
332+
333+
**Edit:** `CHANGELOG.md` is no longer modified in this PR. This concern is resolved.
334+
token: ${{ secrets.GITHUB_TOKEN }}

‎pr-checks/checks/linux-arm64.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)