Merge branch 'master' into feat/worker-sync

.github/workflows/deploy-sync-test.yml

@@ -1,8 +1,16 @@
 name: Deploy new sync test
 
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "Git branch to build & deploy"
+        required: true
+        default: "feat/worker-sync"
+
 env:
   CLOJURE_VERSION: "1.11.1.1413"
-  NODE_VERSION: '22'
+  NODE_VERSION: "22"
   JAVA_VERSION: "11"
 
 jobs:
@@ -10,21 +18,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/download-artifact@v4
+      - name: Checkout selected branch
+        uses: actions/checkout@v4
         with:
-          name: e2e-success
-          path: .
-        continue-on-error: true
-
-      # FIXME: download not found for successful e2e
-      # - name: Check E2E success
-      #   run: |
-      #     if [ ! -f e2e-success.txt ]; then
-      #       echo "❌ E2E tests did not succeed — aborting release."
-      #       exit 1
-      #     fi
-
-      - uses: actions/checkout@v4
+          ref: ${{ inputs.branch }}
+          fetch-depth: 0
 
       - name: Setup Java JDK
         uses: actions/setup-java@v4
@@ -37,39 +35,38 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
 
-      - name: Setup clojure
+      - name: Setup Clojure
         uses: DeLaGuardo/[email protected]
         with:
           cli: ${{ env.CLOJURE_VERSION }}
 
-      - name: Fetch yarn deps
+      - name: Install Yarn deps
         run: yarn install --frozen-lockfile
 
-      - name: Set Build Environment Variables
+      - name: Set build environment flags
         run: |
           echo "ENABLE_FILE_SYNC_PRODUCTION=true" >> $GITHUB_ENV
           echo "ENABLE_RTC_SYNC_PRODUCTION=true" >> $GITHUB_ENV
 
-      - name: Build Released-Web
+      - name: Build web + workers
         run: |
-          yarn gulp:build && clojure -M:cljs release app db-worker inference-worker  --config-merge '{:compiler-options {:source-map true :source-map-include-sources-content true :source-map-detail-level :symbols}}' && yarn webpack-app-build
-          rsync -avz --exclude node_modules --exclude android --exclude ios --exclude mobile ./static/ ./public/
-          ls -lR ./public && mkdir r2 && mv ./public/js/main.js.map ./r2/db-test.main.js.map
-          sed -i 's/=main.js.map/=https:\/\/assets.logseq.io\/db-test.main.js.map/g' ./public/js/main.js
+          yarn gulp:build
+          clojure -M:cljs release app db-worker inference-worker \
+            --config-merge '{:compiler-options {:source-map true :source-map-include-sources-content true :source-map-detail-level :symbols}}'
+          yarn webpack-app-build
+
+          rsync -avz \
+            --exclude node_modules \
+            --exclude android \
+            --exclude ios \
+            --exclude mobile \
+            ./static/ ./public/
+
+          rm ./public/js/*.map
+
         env:
-          LOGSEQ_SENTRY_DSN: ${{ secrets.LOGSEQ_SENTRY_DSN }}
           LOGSEQ_POSTHOG_TOKEN: ${{ secrets.LOGSEQ_POSTHOG_TOKEN }}
 
-      - name: Upload to R2
-        uses: ryand56/r2-upload-action@latest
-        with:
-          r2-account-id: 2553ea8236c11ea0f88de28fce1cbfee
-          r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
-          r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          r2-bucket: ${{ secrets.R2_ASSETS_BUCKET }}
-          source-dir: r2
-          destination-dir: ./
-
       - name: Publish to Cloudflare Pages
         uses: cloudflare/pages-action@1
         with:
@@ -78,4 +75,4 @@ jobs:
           projectName: "sync"
           directory: "public"
           gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          branch: "main"
+          branch: ${{ inputs.branch }}