beep boop

Author: Ethan-Arrowood

.github/workflows/deploy.yaml

@@ -1,43 +1,27 @@
 name: Deploy Docusaurus to GitHub Pages
 
 on:
-  # Trigger the workflow on pull requests and pushes to specific branches
-  pull_request:
   push:
     branches:
       - main
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 # Concurrency configuration to manage parallel workflow runs
-#
-# Group composition: pages-<event_type>-<unique_identifier>
-# - event_type: 'pull_request', 'push', or 'workflow_dispatch'
-# - unique_identifier: PR number for PRs, branch ref for pushes/manual runs
-#
-# Examples of group names:
-# - PR #123: "pages-pull_request-123"
-# - Push to main: "pages-push-refs/heads/main"
-# - Manual run on main: "pages-workflow_dispatch-refs/heads/main"
-#
-# Behavior:
-# - PRs: New commits cancel previous runs (cancel-in-progress: true)
-# - Main branch: Runs complete without cancellation (cancel-in-progress: false)
-# - Manual dispatch: Runs complete without cancellation (cancel-in-progress: false)
 concurrency:
-  group: pages-${{ github.event_name }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: production-deploy
+  cancel-in-progress: false
 
 jobs:
   build:
     name: Build Docusaurus
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: 'npm'
@@ -81,8 +65,6 @@ jobs:
     needs: build
     name: Deploy to GitHub Pages
     runs-on: ubuntu-latest
-    # Only deploy on push to main or manual trigger, not on PRs
-    if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'workflow_dispatch'
 
     permissions:
       pages: write

.github/workflows/pr-preview.yaml

@@ -44,6 +44,13 @@ jobs:
           echo "Building site with base URL: $DOCUSAURUS_BASE_URL"
           npm run build
 
+      - name: Upload build artifact for local testing
+        uses: actions/upload-artifact@v4
+        with:
+          name: pr-${{ github.event.pull_request.number }}-build
+          path: build/
+          retention-days: 30
+
       - name: Prepare deployment directory
         run: |
           PR_DIR="pr-${{ github.event.pull_request.number }}"
@@ -149,9 +156,19 @@ jobs:
           npm install harperdb
 
       - name: Remove preview deployment
+        env:
+          HARPER_PREVIEW_TARGET: ${{ secrets.HARPER_PREVIEW_TARGET }}
+          HARPER_PREVIEW_USERNAME: ${{ secrets.HARPER_PREVIEW_USERNAME }}
+          HARPER_PREVIEW_PASSWORD: ${{ secrets.HARPER_PREVIEW_PASSWORD }}
         run: |
           # Add your cleanup command here (e.g., harper undeploy or similar)
-          npx harper drop-component project=pr-${{ github.event.pull_request.number }} replicated=true restart=true
+          npx harper drop-component \
+            target=${HARPER_PREVIEW_TARGET}:9925 \
+            username=$HARPER_PREVIEW_USERNAME \
+            password=$HARPER_PREVIEW_PASSWORD \
+            project=pr-${{ github.event.pull_request.number }} \
+            replicated=true \
+            restart=true
           echo "Cleaning up preview for PR #${{ github.event.pull_request.number }}"
 
       - name: Update deployment status

scripts/preview-pr.mjs

@@ -98,7 +98,7 @@ async function main() {
 		// Get the workflow run for this PR (using sanitized branch name)
 		const runs = JSON.parse(
 			execSync(
-				`gh api repos/HarperDB/documentation/actions/runs --paginate -X GET -f branch=${sanitizedBranch} --jq '.workflow_runs | map(select(.conclusion == "success" and .name == "Deploy Docusaurus to GitHub Pages")) | sort_by(.created_at) | reverse | .[0]'`,
+				`gh api repos/HarperDB/documentation/actions/runs --paginate -X GET -f branch=${sanitizedBranch} --jq '.workflow_runs | map(select(.conclusion == "success" and .name == "Deploy PR Preview")) | sort_by(.created_at) | reverse | .[0]'`,
 				{ encoding: 'utf-8' }
 			)
 		);
@@ -126,10 +126,11 @@ async function main() {
 			})
 		);
 
-		const artifact = artifacts.find((a) => a.name === 'github-pages');
+		const artifactName = `pr-${PR_NUMBER}-build`;
+		const artifact = artifacts.find((a) => a.name === artifactName);
 
 		if (!artifact) {
-			console.error(`❌ No 'github-pages' artifact found for this PR`);
+			console.error(`❌ No '${artifactName}' artifact found for this PR`);
 			process.exit(1);
 		}
 
@@ -170,28 +171,19 @@ async function main() {
 			throw new Error('Downloaded artifact file not found');
 		}
 
-		// Extract the artifact (it's a tar.gz inside a zip)
+		// Extract the artifact (it's a direct zip of the build directory)
 		console.log('📂 Extracting artifact...');
-		execSync(`unzip -q "${artifactZip}" -d "${PR_DIR}"`, { stdio: 'inherit' });
-
-		// The github-pages artifact contains a tar.gz file
-		const tarFile = join(PR_DIR, 'artifact.tar');
-		if (existsSync(tarFile)) {
-			mkdirSync(BUILD_DIR, { recursive: true });
-			execSync(`tar -xzf "${tarFile}" -C "${BUILD_DIR}"`, { stdio: 'inherit' });
-		} else {
-			throw new Error('Expected artifact.tar not found in artifact');
-		}
+		mkdirSync(BUILD_DIR, { recursive: true });
+		execSync(`unzip -q "${artifactZip}" -d "${BUILD_DIR}"`, { stdio: 'inherit' });
 
 		// Verify extracted files are within expected directory
 		const resolvedBuildDir = join(BUILD_DIR);
 		if (!resolvedBuildDir.startsWith(PREVIEW_DIR)) {
 			throw new Error('Security violation: extracted files outside preview directory');
 		}
 
-		// Clean up compressed files
+		// Clean up zip file
 		rmSync(artifactZip, { force: true });
-		rmSync(tarFile, { force: true });
 
 		console.log('\n✅ Preview ready!\n');
 		console.log(`📁 Build location: ${BUILD_DIR}`);