Skip to content

Commit 4008e2b

Browse files
luisleo526claude
andcommitted
Merge main 0212cab (D1, PR 449) into the D3 branch
D3 (macOS Debug leaves the pull-request matrix) was written on the pre-merge D1 squash 14c3365; main's final D1 is textually identical to it in the four files that conflicted (AGENTS.md, docs/ci.md, scripts/ci_preflight.py, scripts/test_ci_preflight.py: git diff 14c3365 0212cab is empty for them), so each conflict resolves to the D3 side. No D1 text is dropped; D3's own rewritten sentences are named in the D3 commit message. Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
2 parents 600a8f0 + 0212cab commit 4008e2b

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ permissions:
2222
deployments: write
2323

2424
concurrency:
25-
group: docs-${{ github.ref }}
26-
cancel-in-progress: true
25+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
26+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
2727

2828
jobs:
2929
build:

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.1
1+
1.6.2-rc.1

‎docker/run_failure_codes_diff.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"schema": "pineforge-run-failure-catalog-diff/v1",
33
"from": {
4-
"version": "1.6.1",
5-
"tag": "v1.6.1",
4+
"version": "1.6.2-rc.1",
5+
"tag": "v1.6.2-rc.1",
66
"catalogSha256": "7d61bad51f1f624a83fe90abb64646758c89f6e23c099e52167f9f1c11994d26"
77
},
88
"to": {

0 commit comments

Comments
 (0)