Reset branch to main

.github/workflows/build-and-publish.yml

@@ -12,9 +12,11 @@ jobs:
   # New job to build dist and create release
   build-and-release:
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
+    if: github.repository == 'alam00000/bentopdf' && startsWith(github.ref, 'refs/tags/')
     permissions:
       contents: write
+    env:
+      HUSKY: 0
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -49,10 +51,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  docker-build-and-push:
+  # Build each platform natively in parallel, then merge manifests
+  build-amd64:
     runs-on: ubuntu-latest
+    if: github.repository == 'alam00000/bentopdf'
     permissions:
-      contents: write
+      contents: read
       packages: write
     strategy:
       matrix:
@@ -67,18 +71,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -86,7 +81,7 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract version and determine release type
+      - name: Extract version
         id: version
         run: |
           if [[ $GITHUB_REF == refs/tags/v* ]]; then
@@ -101,8 +96,7 @@ jobs:
             echo "is_release=false" >> $GITHUB_OUTPUT
           fi
 
-      # Build and push for releases (with 'latest' tag)
-      - name: Build and push ${{ matrix.mode.name }} image (release)
+      - name: Build and push amd64 ${{ matrix.mode.name }} (release)
         if: steps.version.outputs.is_release == 'true'
         uses: docker/build-push-action@v6
         with:
@@ -110,18 +104,12 @@ jobs:
           build-args: |
             SIMPLE_MODE=${{ matrix.mode.simple_mode }}
           tags: |
-            bentopdf/bentopdf${{ matrix.mode.suffix }}:latest
-            bentopdf/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version_without_v }}
-            bentopdf/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}
-            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:latest
-            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version_without_v }}
-            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-amd64
+          platforms: linux/amd64
+          cache-from: type=gha,scope=amd64-${{ matrix.mode.name }}
+          cache-to: type=gha,mode=max,scope=amd64-${{ matrix.mode.name }}
 
-      # Build and push for main branch (with 'edge' tag)
-      - name: Build and push ${{ matrix.mode.name }} image (edge)
+      - name: Build and push amd64 ${{ matrix.mode.name }} (edge)
         if: steps.version.outputs.is_release == 'false'
         uses: docker/build-push-action@v6
         with:
@@ -129,10 +117,208 @@ jobs:
           build-args: |
             SIMPLE_MODE=${{ matrix.mode.simple_mode }}
           tags: |
-            bentopdf/bentopdf${{ matrix.mode.suffix }}:edge
-            bentopdf/bentopdf${{ matrix.mode.suffix }}:sha-${{ steps.version.outputs.short_sha }}
-            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge
-            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:sha-${{ steps.version.outputs.short_sha }}
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-amd64
+          platforms: linux/amd64
+          cache-from: type=gha,scope=amd64-${{ matrix.mode.name }}
+          cache-to: type=gha,mode=max,scope=amd64-${{ matrix.mode.name }}
+
+  build-arm64:
+    runs-on: ubuntu-24.04-arm  # Native ARM64 runner
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        mode:
+          - name: default
+            simple_mode: false
+            suffix: ""
+          - name: simple
+            simple_mode: true
+            suffix: "-simple"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract version
+        id: version
+        run: |
+          if [[ $GITHUB_REF == refs/tags/v* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+            echo "version=${VERSION}" >> $GITHUB_OUTPUT
+            echo "version_without_v=${VERSION#v}" >> $GITHUB_OUTPUT
+            echo "is_release=true" >> $GITHUB_OUTPUT
+          else
+            SHORT_SHA=${GITHUB_SHA::7}
+            echo "version=edge" >> $GITHUB_OUTPUT
+            echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
+            echo "is_release=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and push arm64 ${{ matrix.mode.name }} (release)
+        if: steps.version.outputs.is_release == 'true'
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          build-args: |
+            SIMPLE_MODE=${{ matrix.mode.simple_mode }}
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-arm64
+          platforms: linux/arm64
+          cache-from: type=gha,scope=arm64-${{ matrix.mode.name }}
+          cache-to: type=gha,mode=max,scope=arm64-${{ matrix.mode.name }}
+
+      - name: Build and push arm64 ${{ matrix.mode.name }} (edge)
+        if: steps.version.outputs.is_release == 'false'
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          build-args: |
+            SIMPLE_MODE=${{ matrix.mode.simple_mode }}
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-arm64
+          platforms: linux/arm64
+          cache-from: type=gha,scope=arm64-${{ matrix.mode.name }}
+          cache-to: type=gha,mode=max,scope=arm64-${{ matrix.mode.name }}
+
+  # Merge GHCR manifests after both platforms are built
+  merge-manifests-ghcr:
+    runs-on: ubuntu-latest
+    needs: [build-amd64, build-arm64]
+    permissions:
+      packages: write
+    strategy:
+      matrix:
+        mode:
+          - name: default
+            suffix: ""
+          - name: simple
+            suffix: "-simple"
+    steps:
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract version
+        id: version
+        run: |
+          if [[ $GITHUB_REF == refs/tags/v* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+            echo "version=${VERSION}" >> $GITHUB_OUTPUT
+            echo "version_without_v=${VERSION#v}" >> $GITHUB_OUTPUT
+            echo "is_release=true" >> $GITHUB_OUTPUT
+          else
+            SHORT_SHA=${GITHUB_SHA::7}
+            echo "version=edge" >> $GITHUB_OUTPUT
+            echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
+            echo "is_release=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create and push GHCR manifest (release)
+        if: steps.version.outputs.is_release == 'true'
+        run: |
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:latest \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-arm64
+
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }} \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-arm64
+
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version_without_v }} \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-arm64
+
+      - name: Create and push GHCR manifest (edge)
+        if: steps.version.outputs.is_release == 'false'
+        run: |
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-arm64
+
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:sha-${{ steps.version.outputs.short_sha }} \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-arm64
+
+  # Copy images from GHCR to DockerHub
+  push-to-dockerhub:
+    runs-on: ubuntu-latest
+    needs: [merge-manifests-ghcr]
+    continue-on-error: true
+    permissions:
+      contents: read
+      packages: read
+    strategy:
+      matrix:
+        mode:
+          - name: default
+            suffix: ""
+          - name: simple
+            suffix: "-simple"
+    steps:
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Extract version
+        id: version
+        run: |
+          if [[ $GITHUB_REF == refs/tags/v* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+            echo "version=${VERSION}" >> $GITHUB_OUTPUT
+            echo "version_without_v=${VERSION#v}" >> $GITHUB_OUTPUT
+            echo "is_release=true" >> $GITHUB_OUTPUT
+          else
+            SHORT_SHA=${GITHUB_SHA::7}
+            echo "version=edge" >> $GITHUB_OUTPUT
+            echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
+            echo "is_release=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Copy images to DockerHub (release)
+        if: steps.version.outputs.is_release == 'true'
+        run: |
+          docker buildx imagetools create -t bentopdfteam/bentopdf${{ matrix.mode.suffix }}:latest \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-arm64
+
+          docker buildx imagetools create -t bentopdfteam/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }} \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-arm64
+
+          docker buildx imagetools create -t bentopdfteam/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version_without_v }} \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:${{ steps.version.outputs.version }}-arm64
+
+      - name: Copy images to DockerHub (edge)
+        if: steps.version.outputs.is_release == 'false'
+        run: |
+          docker buildx imagetools create -t bentopdfteam/bentopdf${{ matrix.mode.suffix }}:edge \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-arm64
+
+          docker buildx imagetools create -t bentopdfteam/bentopdf${{ matrix.mode.suffix }}:sha-${{ steps.version.outputs.short_sha }} \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-amd64 \
+            ghcr.io/${{ github.repository_owner }}/bentopdf${{ matrix.mode.suffix }}:edge-arm64

.github/workflows/sponsors.yml

@@ -0,0 +1,12 @@
+name: Update Sponsors
+on:
+  workflow_dispatch:
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: JamesIves/github-sponsors-readme-action@v1
+        with:
+          token: ${{ secrets.SPONSORS_TOKEN }}
+          file: 'README.md'

.github/workflows/static.yml

@@ -0,0 +1,67 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["main"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+
+# Configure these variables under your repo settings.
+# You will likely need to set BASE_URL to be the name of your repo eg 'bentopdf'
+env:
+  SIMPLE_MODE: ${{ vars.SIMPLE_MODE }}
+  BASE_URL: ${{ vars.BASE_URL }}/ 
+  HUSKY: 0 
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    if: github.repository == 'alam00000/bentopdf'
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - name: Install dependencies
+        run: npm ci
+      - name: Build distribution
+        run: |
+          # export SIMPLE_MODE=${{ vars.SIMPLE_MODE }}
+          #  export BASE_URL=${{ vars.BASE_URL }}/ 
+          npm run build
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: dist
+          name: github-pages-deployment
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+        with:
+          artifact_name: github-pages-deployment

.github/workflows/update-embedpdf-snippet.yml

@@ -39,13 +39,6 @@ jobs:
             echo "Updating from '${{ steps.current-version.outputs.version }}' to '${{ steps.upstream-version.outputs.version }}'"
           fi
 
-      - name: Setup Node
-        if: steps.gate.outputs.run == 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: npm
-
       - name: Enable corepack (pnpm)
         if: steps.gate.outputs.run == 'true'
         run: corepack enable
@@ -58,24 +51,31 @@ jobs:
 
       - name: Clone upstream embed-pdf-viewer
         if: steps.gate.outputs.run == 'true'
-        run: git clone https://github.com/embedpdf/embed-pdf-viewer ../embed-pdf-viewer
+        run: git clone --depth 1 --branch main https://github.com/embedpdf/embed-pdf-viewer ./_upstream/embed-pdf-viewer
+
+      - name: Setup Node
+        if: steps.gate.outputs.run == 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
 
       - name: Install upstream deps
         if: steps.gate.outputs.run == 'true'
-        working-directory: ../embed-pdf-viewer
-        run: pnpm install --frozen-lockfile
+        working-directory: ./_upstream/embed-pdf-viewer
+        run: pnpm install --no-frozen-lockfile
 
       - name: Build snippet
         if: steps.gate.outputs.run == 'true'
-        working-directory: ../embed-pdf-viewer
+        working-directory: ./_upstream/embed-pdf-viewer
         run: pnpm run build:snippet
 
       - name: Pack snippet tarball
         if: steps.gate.outputs.run == 'true'
-        working-directory: ../embed-pdf-viewer
+        working-directory: ./_upstream/embed-pdf-viewer
         run: |
-          npm pack ./snippet --pack-destination ../bentopdf/vendor/embedpdf
-          ls -l ../bentopdf/vendor/embedpdf
+          npm pack ./viewers/snippet --pack-destination ../../vendor/embedpdf
+          ls -l ../../vendor/embedpdf
 
       - name: Sanitize tarball (rename pkg and pin deps)
         if: steps.gate.outputs.run == 'true'
@@ -114,19 +114,23 @@ jobs:
 
       - name: Refresh lockfile
         if: steps.gate.outputs.run == 'true'
-        run: npm install --package-lock-only
+        run: npm install --package-lock-only --ignore-scripts
 
       - name: Write upstream version marker
         if: steps.gate.outputs.run == 'true'
         run: |
           echo "${{ steps.upstream-version.outputs.version }}" > vendor/embedpdf/.upstream-version
 
+      - name: Cleanup upstream clone
+        if: steps.gate.outputs.run == 'true'
+        run: rm -rf ./_upstream
+
       - name: Create Pull Request
         if: steps.gate.outputs.run == 'true'
         uses: peter-evans/create-pull-request@v6
         with:
-          commit-message: 'chore: update embedpdf snippet'
-          title: 'Update vendored EmbedPDF snippet'
+          commit-message: "build(deps): bump embedpdf-snippet from ${{ steps.current-version.outputs.version }} to ${{ steps.upstream-version.outputs.version }}"
+          title: "build(deps): bump embedpdf-snippet from ${{ steps.current-version.outputs.version }} to ${{ steps.upstream-version.outputs.version }}"
           body: |
             - Build snippet from upstream embed-pdf-viewer via `npm run build:snippet`
             - Pack tarball into `vendor/embedpdf/` and point dependency to it