deployment fix?

Author: abrulic

.github/workflows/validate.yaml

@@ -2,6 +2,7 @@ name: 🚀 Validation Pipeline
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
+
 on:
   push:
     branches: [main]
@@ -11,91 +12,92 @@ on:
 permissions:
   actions: write
   contents: read
-  # Required to put a comment into the pull-request
   pull-requests: write
+
 jobs:
   lint:
     name: ⬣ Biome lint
     runs-on: ubuntu-latest
     steps:
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
-      - name: Setup Biome
-        uses: biomejs/setup-biome@v2
-      - name: Run Biome
-        run: biome ci .
+      - uses: actions/checkout@v4
+      - uses: biomejs/setup-biome@v2
+      - run: biome ci .
 
   validate:
     name: 🔎 Validate
     runs-on: ubuntu-latest
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.12.1
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
-      - name: ⎔ Setup node
-        uses: actions/setup-node@v4
+      - uses: styfle/cancel-workflow-action@0.12.1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-      - name: Install dependencies
-        run: pnpm install
-      - name: 🔎 Validate
-        run: pnpm run test
-
+      - uses: pnpm/action-setup@v4
+      - run: pnpm install
+      - run: pnpm run test
 
   build-docs:
     if: ${{ github.event_name == 'pull_request' }}
     name: Build Docs
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-      - name: Setup Node
-        uses: actions/setup-node@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: "package.json"
-          cache: "pnpm"
+          cache: pnpm
 
-      - name: Install deps
-        run: pnpm install --prefer-offline --frozen-lockfile
+      - run: pnpm install --prefer-offline --frozen-lockfile
 
       - name: Generate docs
         working-directory: docs
-        run: pnpm run generate:docs
+        env:
+          APP_ENV: production
+        run: pnpm run generate:docs -- --branch ${{ github.event.repository.default_branch }}
 
-      - name: Upload generated docs artifact
+      - name: Pack generated docs (tarball)
+        run: tar -czf docs-generated.tgz -C docs generated-docs
+
+      - name: Upload generated docs (tgz)
         uses: actions/upload-artifact@v4
         with:
-          name: docs-generated
-          path: |
-            docs/generated-docs/**
-            docs/app/utils/versions.ts
+          name: docs-generated-tgz
+          path: docs-generated.tgz
+          if-no-files-found: error
+
+      - name: Upload versions file
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs-versions
+          path: docs/app/utils/versions.ts
           if-no-files-found: error
 
   deploy-docs-pr-preview:
     if: ${{ github.event_name == 'pull_request' }}
     name: 🚀 Deploy Docs
-    needs: [lint, validate, build-docs] 
+    needs: [lint, validate, build-docs]
     runs-on: ubuntu-latest
-    environment:
-      name: docs-release
     steps:
       - uses: actions/checkout@v4
-      - name: Download generated docs
+
+      - name: Download generated docs (tgz)
+        uses: actions/download-artifact@v4
+        with:
+          name: docs-generated-tgz
+          path: .
+
+      - name: Unpack generated docs into docs/
+        run: tar -xzf docs-generated.tgz -C docs
+
+      - name: Download versions file
         uses: actions/download-artifact@v4
         with:
-          name: docs-generated
-          path: docs
+          name: docs-versions
+          path: docs/app/utils
 
-      # check TODO remove this
-      - name: List generated payload
-        run: ls -laR docs/generated-docs | head -n 200
       - uses: forge-42/fly-deploy@v1.0.0-rc.2
         id: deploy
         env:

docs/Dockerfile

@@ -13,29 +13,26 @@ RUN npm install -g pnpm@$PNPM_VERSION
 # --- Build stage ---
 FROM base AS build
 
-# System deps only if you have native modules; otherwise you can drop this
+# If you DON'T have native deps, you can remove this apt-get block.
 RUN apt-get update -qq && \
     apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 && \
     rm -rf /var/lib/apt/lists/*
 
-# Install deps
-COPY .npmrc package.json ./
-RUN pnpm install --prod=false
+# Install deps (use lockfile for reproducible builds if present)
+COPY .npmrc package.json pnpm-lock.yaml ./
+RUN pnpm install --frozen-lockfile --prod=false
 
-# Copy the application (including the previously downloaded artifact under docs/)
+# Copy the application (includes pre-generated docs & versions.ts from CI)
 COPY . .
 
-# IMPORTANT: we no longer generate docs here; they were provided by CI
-# Build the app (should read from docs/generated-docs/* and versions.ts that CI uploaded)
+# Build the app (no docs generation here)
 RUN pnpm run build
 
 # Prune dev deps
 RUN pnpm prune --prod
 
 # --- Runtime stage ---
 FROM base
-
 COPY --from=build /app /app
-
 EXPOSE 3000
 CMD ["pnpm","run","start"]

docs/scripts/generate-docs.ts

@@ -35,7 +35,14 @@ const contentDir = "content"
 const outputDir = "generated-docs"
 const APP_ENV = getServerEnv().APP_ENV as "development" | "production"
 const currentDocsWorkspace = process.cwd()
-const docsRelative = run("git rev-parse --show-prefix", { cwd: currentDocsWorkspace }).replace(/\/?$/, "")
+
+// Make docsRelative safe even if something odd happens with git in CI
+let docsRelative = ""
+try {
+	docsRelative = run("git rev-parse --show-prefix", { cwd: currentDocsWorkspace }).replace(/\/?$/, "")
+} catch {
+	docsRelative = ""
+}
 
 const allTags = () => run("git tag --list").split("\n").filter(Boolean)
 
@@ -105,6 +112,28 @@ function buildRef(ref: string, labelForOutDir: string) {
 	}
 }
 
+function hasLocalRef(ref: string) {
+	try {
+		run(`git show-ref --verify --quiet ${ref}`)
+		return true
+	} catch {
+		return false
+	}
+}
+
+function buildBranch(branch: string, labelForOutDir: string) {
+	// Ensure we have the remote branch locally available
+	run(`git fetch --tags --prune origin ${branch}`, {
+		cwd: currentDocsWorkspace,
+		inherit: true,
+	})
+
+	const localRef = `refs/heads/${branch}`
+	const targetRef = hasLocalRef(localRef) ? localRef : `origin/${branch}`
+
+	return buildRef(targetRef, labelForOutDir)
+}
+
 function buildTag(tag: string) {
 	return buildRef(`refs/tags/${tag}`, tag)
 }
@@ -121,6 +150,7 @@ function buildSpecifiedTags(spec: string, envLabel: "dev" | "prod"): string[] {
 	for (const tag of tags) buildTag(tag)
 	return tags
 }
+
 ;(async () => {
 	const { values } = parseArgs({
 		args: process.argv.slice(2),
@@ -151,7 +181,7 @@ function buildSpecifiedTags(spec: string, envLabel: "dev" | "prod"): string[] {
 		// PROD + no --versions => build content from default branch only
 		// biome-ignore lint/suspicious/noConsole: keep console log for debugging
 		console.log(chalk.cyan(`(prod) Building docs from '${branch}' branch only → ${branch}`))
-		buildRef(`refs/heads/${branch}`, branch)
+		buildBranch(branch, branch) // << use local refs/heads/<branch> if present, else origin/<branch>
 		builtVersions = [branch]
 	} else {
 		builtVersions = buildSpecifiedTags(values.versions as string, APP_ENV === "development" ? "dev" : "prod")