Skip to content

Commit 5b75673

Browse files
authored
Merge pull request #155 from 0xMiden/kbg/fix/snapshot-workflow
fix: workflows folder structure and disable cut-versions re-trigger on main
2 parents a2a27e8 + 3b13bee commit 5b75673

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

.github/workflows/cut-versions.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# v0.4 Information Architecture:
66
# - Design docs (miden-base, miden-vm, compiler, miden-node) → docs/design/
7-
# - Builder docs (miden-tutorials, miden-client) → docs/builder/
7+
# - Builder docs (miden-tutorials, miden-client) → docs/builder/develop/tutorials/, docs/builder/tools/client/
88
#
99
# Workflow responsibilities:
1010
# 1. Check out external repos at pinned refs
@@ -34,8 +34,9 @@ on:
3434
compiler_ref: { required: false }
3535
miden_tutorials_ref: { required: false }
3636

37-
# Optional: auto-run when manifest changes (enable after you trust the flow)
37+
# Auto-run when manifest changes on a branch (NOT main — prevents re-triggering on merge)
3838
push:
39+
branches-ignore: [main]
3940
paths:
4041
- ".release/release-manifest.yml"
4142

@@ -150,7 +151,8 @@ jobs:
150151
151152
# Clean directories that will be re-synced (v0.4 nested paths)
152153
rm -rf docs/design/miden-base docs/design/miden-vm docs/design/miden-node docs/design/compiler
153-
rm -rf docs/builder/tutorials docs/builder/client
154+
rm -rf docs/builder/tools/client
155+
# Note: docs/builder/develop/tutorials is NOT fully cleaned to preserve local tutorials (e.g. miden-bank)
154156
155157
# Design docs → docs/design/*
156158
if [ -d "vendor/miden-base/docs/src" ]; then
@@ -178,16 +180,17 @@ jobs:
178180
fi
179181
180182
# Builder docs → docs/builder/*
183+
# Sync miden-tutorials into develop/tutorials (local tutorials are preserved)
181184
if [ -d "vendor/miden-tutorials/docs/src" ]; then
182-
mkdir -p docs/builder/tutorials
183-
cp -r vendor/miden-tutorials/docs/src/* docs/builder/tutorials/
184-
echo "Synced miden-tutorials → docs/builder/tutorials"
185+
mkdir -p docs/builder/develop/tutorials
186+
cp -r vendor/miden-tutorials/docs/src/* docs/builder/develop/tutorials/
187+
echo "Synced miden-tutorials → docs/builder/develop/tutorials"
185188
fi
186189
187-
if [ -d "vendor/miden-client/docs/src" ]; then
188-
mkdir -p docs/builder/client
189-
cp -r vendor/miden-client/docs/src/* docs/builder/client/
190-
echo "Synced miden-client → docs/builder/client"
190+
if [ -d "vendor/miden-client/docs/external/src" ]; then
191+
mkdir -p docs/builder/tools/client
192+
cp -r vendor/miden-client/docs/external/src/* docs/builder/tools/client/
193+
echo "Synced miden-client → docs/builder/tools/client"
191194
fi
192195
193196
echo "Content aggregation complete. Final docs structure:"
@@ -196,6 +199,8 @@ jobs:
196199
ls -la docs/design/ || true
197200
echo "Builder subdirs:"
198201
ls -la docs/builder/ || true
202+
echo "Tutorials subdirs:"
203+
ls -la docs/builder/develop/tutorials/ || true
199204
200205
- name: Cut version snapshot
201206
run: |
@@ -214,8 +219,8 @@ jobs:
214219
rm -rf docs/design/miden-vm
215220
rm -rf docs/design/miden-node
216221
rm -rf docs/design/compiler
217-
rm -rf docs/builder/tutorials
218-
rm -rf docs/builder/client
222+
rm -rf docs/builder/tools/client
223+
# Note: tutorials live in docs/builder/develop/tutorials/ (authored content, not cleaned)
219224
220225
- name: Commit snapshots
221226
run: |

.github/workflows/deploy-docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
148148
# Clean directories that will be re-synced (v0.4 nested paths)
149149
rm -rf docs/design/miden-base docs/design/miden-vm docs/design/miden-node docs/design/compiler
150-
rm -rf docs/builder/client
150+
rm -rf docs/builder/tools/client
151151
# Note: docs/builder/develop/tutorials is NOT fully cleaned to preserve local tutorials (e.g. miden-bank)
152152
153153
# Design docs → docs/design/*
@@ -184,9 +184,9 @@ jobs:
184184
fi
185185
186186
if [ -d "vendor/miden-client/docs/external/src" ]; then
187-
mkdir -p docs/builder/client
188-
cp -r vendor/miden-client/docs/external/src/* docs/builder/client/
189-
echo "Synced miden-client → docs/builder/client"
187+
mkdir -p docs/builder/tools/client
188+
cp -r vendor/miden-client/docs/external/src/* docs/builder/tools/client/
189+
echo "Synced miden-client → docs/builder/tools/client"
190190
fi
191191
192192
echo "Content aggregation complete. Final docs structure:"

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,11 @@ refs:
152152
153153
#### 2. Run the Version Cut Workflow
154154
155-
Trigger `.github/workflows/cut-versions.yml` (manually or via push to manifest):
155+
> **Important:** Run this workflow on a **branch** (not `main`). The workflow commits the snapshot
156+
> to the current branch, allowing you to review changes in a PR before merging to `main`.
157+
> The workflow is configured to NOT run automatically when changes are pushed to `main`.
158+
159+
Trigger `.github/workflows/cut-versions.yml` on a branch (manually via `workflow_dispatch`, or by pushing the updated manifest to the branch):
156160

157161
The workflow executes these steps:
158162
1. **Checkout external repos** at pinned refs
@@ -178,7 +182,7 @@ The `.github/workflows/deploy-docs.yml` workflow:
178182
1. Checks out this repository and all external source repos
179183
2. Ingests external docs into v0.4 IA structure:
180184
- Design docs → `docs/design/miden-base/`, `miden-vm/`, `compiler/`, `miden-node/`
181-
- Builder docs → `docs/builder/tutorials/`, `docs/builder/client/`
185+
- Builder docs → `docs/builder/develop/tutorials/`, `docs/builder/tools/client/`
182186
3. Runs `npm run build` to generate the static site
183187
4. Deploys to GitHub Pages at `docs.miden.xyz`
184188

0 commit comments

Comments
 (0)