Skip to content

Commit 991f802

Browse files
committed
ci: retarget installer and checksum automation to integration branch
1 parent 1572b70 commit 991f802

5 files changed

Lines changed: 25 additions & 9 deletions

File tree

.github/workflows/checksum-monitor.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
- cron: "0 */2 * * *" # Every 2 hours (more frequent for faster updates)
66
workflow_dispatch: # Manual trigger for testing
77
push:
8+
branches:
9+
- local-desktop-installation-support
810
paths:
911
- 'scripts/lib/security.sh' # Re-run if security.sh changes
1012
repository_dispatch:
@@ -17,6 +19,8 @@ concurrency:
1719
jobs:
1820
auto-update-checksums:
1921
runs-on: ubuntu-latest
22+
env:
23+
TARGET_BRANCH: local-desktop-installation-support
2024
permissions:
2125
contents: write
2226
issues: write # For creating issues on failure
@@ -26,6 +30,7 @@ jobs:
2630
uses: actions/checkout@v4
2731
with:
2832
token: ${{ secrets.GITHUB_TOKEN }}
33+
ref: ${{ env.TARGET_BRANCH }}
2934

3035
- name: Log repository dispatch payload
3136
if: github.event_name == 'repository_dispatch'
@@ -136,13 +141,13 @@ jobs:
136141
-m "🤖 Generated by checksum-monitor workflow"
137142
138143
# Pull any changes that happened while we were running (rebase our commit on top)
139-
git pull --rebase origin main || {
144+
git pull --rebase origin "${TARGET_BRANCH}" || {
140145
echo "Rebase failed - likely a conflict. Will retry on next scheduled run."
141146
echo "committed=false" >> $GITHUB_OUTPUT
142147
exit 0
143148
}
144149
145-
git push
150+
git push origin "HEAD:${TARGET_BRANCH}"
146151
echo "committed=true" >> $GITHUB_OUTPUT
147152
echo "✅ Successfully pushed checksum updates"
148153
@@ -223,7 +228,7 @@ jobs:
223228
224229
if [[ "${{ steps.verify.outputs.changed }}" == "true" ]]; then
225230
if [[ "${{ steps.commit.outputs.committed }}" == "true" ]]; then
226-
echo "✅ **Checksums automatically updated and committed to main**" >> $GITHUB_STEP_SUMMARY
231+
echo "✅ **Checksums automatically updated and committed to ${TARGET_BRANCH}**" >> $GITHUB_STEP_SUMMARY
227232
else
228233
echo "⚠️ **Changes detected but commit skipped (race condition or conflict)**" >> $GITHUB_STEP_SUMMARY
229234
fi

.github/workflows/installer-canary-strict.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
id: canary
3030
continue-on-error: true
3131
env:
32-
ACFS_CHECKSUMS_REF: main
32+
ACFS_CHECKSUMS_REF: local-desktop-installation-support
3333
run: |
3434
chmod +x ./tests/vm/test_install_ubuntu.sh
3535

.github/workflows/installer-canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Run installer canary
2626
env:
27-
ACFS_CHECKSUMS_REF: main
27+
ACFS_CHECKSUMS_REF: local-desktop-installation-support
2828
run: |
2929
chmod +x ./tests/vm/test_install_ubuntu.sh
3030

.github/workflows/installer-notification-receiver.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ concurrency:
2828
env:
2929
CHECKSUMS_FILE: checksums.yaml
3030
AUDIT_LOG_FILE: .github/audit/installer-updates.jsonl
31+
TARGET_BRANCH: local-desktop-installation-support
3132

3233
permissions:
3334
contents: write
@@ -50,6 +51,7 @@ jobs:
5051
- uses: actions/checkout@v4
5152
with:
5253
fetch-depth: 1
54+
ref: ${{ env.TARGET_BRANCH }}
5355

5456
- name: Install yq
5557
run: |
@@ -164,6 +166,8 @@ jobs:
164166
current_sha256: ${{ steps.compare.outputs.current }}
165167
steps:
166168
- uses: actions/checkout@v4
169+
with:
170+
ref: ${{ env.TARGET_BRANCH }}
167171

168172
- name: Install yq
169173
run: |
@@ -301,6 +305,7 @@ jobs:
301305
- uses: actions/checkout@v4
302306
with:
303307
fetch-depth: 1
308+
ref: ${{ env.TARGET_BRANCH }}
304309

305310
- name: Install yq
306311
run: |
@@ -423,6 +428,8 @@ jobs:
423428
runs-on: ubuntu-latest
424429
steps:
425430
- uses: actions/checkout@v4
431+
with:
432+
ref: ${{ env.TARGET_BRANCH }}
426433

427434
- name: Create Pull Request
428435
env:
@@ -432,10 +439,11 @@ jobs:
432439
BRANCH_NAME="${{ needs.update-checksums.outputs.branch_name }}"
433440
SHORT_SHA="${{ needs.verify-checksum.outputs.computed_sha256 }}"
434441
SHORT_SHA=${SHORT_SHA:0:8}
442+
TARGET_BRANCH="${{ env.TARGET_BRANCH }}"
435443
436444
# Create PR
437445
gh pr create \
438-
--base main \
446+
--base "$TARGET_BRANCH" \
439447
--head "$BRANCH_NAME" \
440448
--title "chore(checksums): Update $TOOL_NAME to $SHORT_SHA" \
441449
--body "${{ needs.update-checksums.outputs.pr_body }}" \
@@ -459,6 +467,8 @@ jobs:
459467
runs-on: ubuntu-latest
460468
steps:
461469
- uses: actions/checkout@v4
470+
with:
471+
ref: ${{ env.TARGET_BRANCH }}
462472

463473
- name: Install yq
464474
run: |
@@ -490,6 +500,7 @@ jobs:
490500
run: |
491501
TOOL_NAME="${{ needs.validate-dispatch.outputs.tool_name }}"
492502
SOURCE_REPO="${{ needs.validate-dispatch.outputs.source_repo }}"
503+
TARGET_BRANCH="${{ env.TARGET_BRANCH }}"
493504
494505
cat > /tmp/removal-pr-body.md << 'PREOF'
495506
## Tool Removal: $TOOL_NAME
@@ -512,7 +523,7 @@ jobs:
512523
sed -i "s|\$SOURCE_REPO|$SOURCE_REPO|g" /tmp/removal-pr-body.md
513524
514525
gh pr create \
515-
--base main \
526+
--base "$TARGET_BRANCH" \
516527
--head "auto/remove-${TOOL_NAME}" \
517528
--title "chore(checksums): Remove $TOOL_NAME" \
518529
--body-file /tmp/removal-pr-body.md \

.github/workflows/manifest-drift.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Internal Checksums Drift Check
22

33
on:
44
push:
5-
branches: [main, master]
5+
branches: [local-desktop-installation-support]
66
pull_request:
7-
branches: [main, master]
7+
branches: [local-desktop-installation-support]
88

99
jobs:
1010
check-drift:

0 commit comments

Comments
 (0)