Skip to content

Rename sync "template infra" to "workshop machinery" #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pierre Malarme (pmalarme) merged 1 commit into from
Jul 16, 2026
Merged

Rename sync "template infra" to "workshop machinery" #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/reset-current-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Reset current step

# Re-lay the CURRENT step's clean starter files and re-render its README, without
# moving to another step. This is the companion to "Sync template infra": sync
# moving to another step. This is the companion to "Sync workshop machinery": sync
# refreshes the workshop machinery (.workshop/ and .github/) while leaving your
# step files and README untouched; this workflow then refreshes the delivery for
# the step you are on. Your travel_assistant/ edits are backed up first, under
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sync-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Sync template infra
name: Sync workshop machinery

# Pull the latest workshop machinery (.workshop/ and .github/) from the upstream
# template into this instance WITHOUT advancing the current step. Participant work
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
# The [skip-advance] sentinel keeps advance-on-push.yml from advancing.
# Keep it in sync with SKIP_ADVANCE_SENTINEL in sync_template.py.
git commit -q -m "workshop: sync template infra from upstream [skip-advance]"
git commit -q -m "workshop: sync machinery from upstream [skip-advance]"
git push

- name: Summarize
Expand All @@ -142,7 +142,7 @@ jobs:
echo "" >> "$GITHUB_STEP_SUMMARY"
echo "Re-run with **Dry run = false** to apply the changes above." >> "$GITHUB_STEP_SUMMARY"
elif [[ "$CHANGED" == "true" ]]; then
echo "## ✅ Template infra synced" >> "$GITHUB_STEP_SUMMARY"
echo "## ✅ Workshop machinery synced" >> "$GITHUB_STEP_SUMMARY"
echo "" >> "$GITHUB_STEP_SUMMARY"
echo "Pulled the latest \`.workshop/\` and \`.github/\` (excluding \`.github/workflows/\`) from \`${UPSTREAM_REF}\` of \`${UPSTREAM_URL}\`." >> "$GITHUB_STEP_SUMMARY"
echo "Your current step was preserved. Run \`git pull\` locally to refresh." >> "$GITHUB_STEP_SUMMARY"
Expand Down
4 changes: 2 additions & 2 deletions .workshop/scripts/sync_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Sync workshop infrastructure from the upstream template into this instance.
"""Sync workshop machinery from the upstream template into this instance.

A workshop *instance* (a repo created from the template) sometimes needs the
latest workshop machinery — the authoring material under ``.workshop/`` and the
Expand Down Expand Up @@ -82,7 +82,7 @@
# moves the workshop to the next step. Keep it in sync with the check in
# .github/workflows/advance-on-push.yml.
SKIP_ADVANCE_SENTINEL = "[skip-advance]"
COMMIT_MESSAGE = f"workshop: sync template infra from upstream {SKIP_ADVANCE_SENTINEL}"
COMMIT_MESSAGE = f"workshop: sync machinery from upstream {SKIP_ADVANCE_SENTINEL}"

# The workflow that enforces the "sync must not advance" contract. Before we
# adopt a new .github/ tree we verify the upstream copy of this file still honors
Expand Down
Loading