From 9d112e900e855ff6838e7ff9fa132e793acb4220 Mon Sep 17 00:00:00 2001 From: scanner Date: Mon, 5 Oct 2026 23:32:57 -0400 Subject: [PATCH 1/2] ci: check out live main in meeting-recordings refresh so auto-commit does not race Signed-off-by: scanner --- .github/workflows/meeting-recordings-refresh.yml | 6 ++++++ changelog.d/fixed-meeting-recordings-refresh-checkout.md | 1 + 2 files changed, 7 insertions(+) create mode 100644 changelog.d/fixed-meeting-recordings-refresh-checkout.md diff --git a/.github/workflows/meeting-recordings-refresh.yml b/.github/workflows/meeting-recordings-refresh.yml index c8ae70d..29b4a54 100644 --- a/.github/workflows/meeting-recordings-refresh.yml +++ b/.github/workflows/meeting-recordings-refresh.yml @@ -16,6 +16,12 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + # On `schedule`, github.sha is main as of trigger time. If the job sits in + # the runner queue (run 37370568225 waited 70 min) that base is stale and + # the auto-commit push below is rejected non-fast-forward. Checking out the + # branch by name fetches the live tip at job start instead. + ref: main - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: node-version: '22' diff --git a/changelog.d/fixed-meeting-recordings-refresh-checkout.md b/changelog.d/fixed-meeting-recordings-refresh-checkout.md new file mode 100644 index 0000000..cf68505 --- /dev/null +++ b/changelog.d/fixed-meeting-recordings-refresh-checkout.md @@ -0,0 +1 @@ +- Check out live `main` in the meeting-recordings refresh workflow so the scheduled auto-commit no longer fails with a non-fast-forward push when the job is queued. From 20cdadef149dd69d5feb4a3d96ec9d3fc203cba8 Mon Sep 17 00:00:00 2001 From: scanner Date: Mon, 5 Oct 2026 23:48:53 -0400 Subject: [PATCH 2/2] build(deps): bump source-map-js to 1.2.2 to clear GHSA-68fv-2mgg-jv7q The production dependency audit gate started failing after this advisory was published; 1.2.2 is the patched release. Signed-off-by: scanner --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9759356..113f1f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14355,9 +14355,9 @@ } }, "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz", + "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0"