Create reusable build-dist workflow

- Add build-dist-reusable.yml with configurable inputs
- Update build-dist.yml to use reusable workflow
- Make script respect DIST_BRANCH env var
- This can now be extracted to a separate repo for reuse

Author: ryan-williams

.github/workflows/build-dist-reusable.yml

@@ -0,0 +1,72 @@
+name: Build dist branch (reusable)
+
+on:
+  workflow_call:
+    inputs:
+      source_ref:
+        description: 'Source ref to build from (commit SHA, branch, or tag)'
+        required: false
+        type: string
+        default: 'main'
+      node_version:
+        description: 'Node.js version to use'
+        required: false
+        type: string
+        default: '20'
+      pnpm_version:
+        description: 'pnpm version to use'
+        required: false
+        type: string
+        default: '9'
+      build_command:
+        description: 'Build command to run'
+        required: false
+        type: string
+        default: 'pnpm run build'
+      dist_branch:
+        description: 'Name of dist branch'
+        required: false
+        type: string
+        default: 'dist'
+
+jobs:
+  build-dist:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.source_ref }}
+
+      - name: Get source commit SHA
+        id: source
+        run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Fetch build script from dist branch
+        run: |
+          git fetch origin ${{ inputs.dist_branch }}
+          git checkout origin/${{ inputs.dist_branch }} -- scripts/build-dist.sh
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: ${{ inputs.pnpm_version }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ inputs.node_version }}
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build
+        run: ${{ inputs.build_command }}
+
+      - name: Build dist branch
+        run: ./scripts/build-dist.sh ${{ steps.source.outputs.sha }}
+        env:
+          DIST_BRANCH: ${{ inputs.dist_branch }}
+
+      - name: Push dist branch
+        run: git push origin ${{ inputs.dist_branch }} --force-with-lease

.github/workflows/build-dist.yml

@@ -8,21 +8,7 @@ on:
         default: 'main'
 jobs:
   build-dist:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.source_ref }}
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 10
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-          cache: 'pnpm'
-      - run: pnpm install --frozen-lockfile
-      - run: pnpm run build
-      - run: ./scripts/build-dist.sh
-      - run: git push origin dist --force-with-lease
+    uses: ./.github/workflows/build-dist-reusable.yml
+    with:
+      source_ref: ${{ inputs.source_ref }}
+      pnpm_version: '10'

scripts/build-dist.sh

@@ -2,14 +2,15 @@
 set -e
 
 SOURCE_SHA="${1:-$(git rev-parse HEAD)}"
+DIST_BRANCH="${DIST_BRANCH:-dist}"
 
-echo "Building dist from source commit: $SOURCE_SHA"
+echo "Building $DIST_BRANCH from source commit: $SOURCE_SHA"
 
 # Checkout or create dist branch
-if git fetch origin dist:dist 2>/dev/null; then
-  git checkout dist
+if git fetch origin "$DIST_BRANCH:$DIST_BRANCH" 2>/dev/null; then
+  git checkout "$DIST_BRANCH"
 else
-  git checkout --orphan dist
+  git checkout --orphan "$DIST_BRANCH"
 fi
 
 # Configure git
@@ -33,9 +34,9 @@ rmdir dist 2>/dev/null || true
 if [ -f package.json.dist ]; then
   mv package.json.dist package.json
 else
-  echo "ERROR: No package.json found on dist branch"
-  echo "This script requires an existing dist branch with a package.json"
-  echo "For initial dist branch setup, manually create package.json with correct paths:"
+  echo "ERROR: No package.json found on $DIST_BRANCH branch"
+  echo "This script requires an existing $DIST_BRANCH branch with a package.json"
+  echo "For initial $DIST_BRANCH branch setup, manually create package.json with correct paths:"
   echo "  main: ./index.cjs (not ./dist/index.cjs)"
   echo "  module: ./index.js (not ./dist/index.js)"
   exit 1
@@ -47,11 +48,11 @@ git add -A
 # Create commit
 if git rev-parse --verify HEAD~0 >/dev/null 2>&1; then
   # dist branch exists, create merge commit
-  git commit -m "Build dist from $SOURCE_SHA" || true
-  git merge --no-ff -m "Merge built dist from main@$SOURCE_SHA" "$SOURCE_SHA" -s ours || true
+  git commit -m "Build $DIST_BRANCH from $SOURCE_SHA" || true
+  git merge --no-ff -m "Merge built $DIST_BRANCH from main@$SOURCE_SHA" "$SOURCE_SHA" -s ours || true
 else
   # First dist commit
-  git commit -m "Initial dist build from $SOURCE_SHA"
+  git commit -m "Initial $DIST_BRANCH build from $SOURCE_SHA"
 fi
 
-echo "Dist branch built successfully"
+echo "$DIST_BRANCH branch built successfully"