chore(release): publish

- @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]
Revert "refactor: use ariakit for super note popovers"
2026-09-13 00:45:26 -04:00 · 2023-12-14 18:27:12 +00:00 · 2023-12-14 23:28:24 +05:30 · 2023-12-14 11:10:41 +00:00 · 2023-12-14 16:11:21 +05:30 · 2023-12-14 16:11:21 +05:30
934 changed files with 24589 additions and 8462 deletions
@@ -9,101 +9,141 @@ updates:
    directory: "/"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/api"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/desktop"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/encryption"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/features"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/filepicker"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/files"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/icons"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/mobile"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/models"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/releases"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/responses"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/services"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/sncrypto-common"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/sncrypto-web"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/snjs"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/styles"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/toast"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/utils"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "npm"
    directory: "/packages/web"
    schedule:
      interval: "daily"
+    allow:
+      - dependency-type: "direct"

  - package-ecosystem: "github-actions"
    directory: "/"
@@ -13,6 +13,7 @@ jobs:
    env:
      CSC_LINK: ${{ secrets.MAC_CI_KEYS }}
      CSC_KEY_PASSWORD: ${{ secrets.MAC_CI_KEYS_PASSWORD }}
+      APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
      NOTARIZE_APPLE_ID: ${{ secrets.NOTARIZE_APPLE_ID }}
      NOTARIZE_APPLE_ID_PASSWORD: ${{ secrets.NOTARIZE_APPLE_ID_PASSWORD }}
    defaults:
@@ -25,7 +26,13 @@ jobs:
          registry-url: 'https://registry.npmjs.org'
          node-version-file: '.nvmrc'
          cache: 'yarn'
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
      - run: yarn install --immutable
+      - name: Rebuild Electron Native Modules
+        run: yarn workspace @standardnotes/desktop rebuild:home-server
      - run: yarn build:desktop
      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV

@@ -49,7 +56,8 @@ jobs:
            packages/desktop/dist/*.yml
            packages/desktop/dist/*.yaml

-  Linux:
+  Linux-AppImage:
+    name: Linux AppImage
    runs-on: ubuntu-latest
    defaults:
      run:
@@ -61,12 +69,18 @@ jobs:
          registry-url: 'https://registry.npmjs.org'
          node-version-file: '.nvmrc'
          cache: 'yarn'
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
      - name: Install FPM
        run: sudo gem install fpm -f

      - run: yarn install --immutable
+
+      - name: Rebuild Electron Native Modules
+        run: yarn workspace @standardnotes/desktop rebuild:home-server
+
      - run: yarn build:desktop

      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
@@ -80,17 +94,43 @@ jobs:
      - name: AppImageArm64
        run: yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}

-      - name: Deb
-        run: |
-          yarn run webpack --config desktop.webpack.prod.js --env deb
-          yarn run electron-builder --linux --x64 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
-      - name: DebArm64
-        env:
-          npm_config_target_arch: 'arm64'
-          USE_SYSTEM_FPM: 'true'
-        run: |
-          yarn run webpack --config desktop.webpack.prod.js --env deb
-          yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
+      - name: Upload
+        uses: actions/[email protected]
+        with:
+          name: assets
+          path: |
+            packages/desktop/dist/*.AppImage
+            packages/desktop/dist/*.yml
+            packages/desktop/dist/*.yaml
+
+  Linux-Dir:
+    name: Linux Dir
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/desktop
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: Install FPM
+        run: sudo gem install fpm -f
+
+      - run: yarn install --immutable
+
+      - name: Rebuild Electron Native Modules
+        run: yarn workspace @standardnotes/desktop rebuild:home-server
+
+      - run: yarn build:desktop
+
+      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV

      - name: Dir
        run: |
@@ -103,29 +143,9 @@ jobs:
        env:
          npm_config_target_arch: 'arm64'

-      - name: Snap
-        run: |
-          sudo snap install snapcraft --classic
-          yarn run webpack --config desktop.webpack.prod.js --env snap
-          yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
-
-      - name: Upload
-        uses: actions/[email protected]
-        with:
-          name: assets
-          path: |
-            packages/desktop/dist/*.snap
-            packages/desktop/dist/*.AppImage
-            packages/desktop/dist/*.deb
-            packages/desktop/dist/*.blockmap
-            packages/desktop/dist/*.yml
-            packages/desktop/dist/*.yaml
-
-  Windows:
-    runs-on: self-hosted
-    env:
-      WINDOWS_TOKEN_ALIAS: ${{ secrets.WINDOWS_TOKEN_ALIAS }}
-      WINDOWS_TOKEN_PASSWORD: ${{ secrets.WINDOWS_TOKEN_PASSWORD }}
+  Linux-Deb:
+    name: Linux Deb
+    runs-on: ubuntu-latest
    defaults:
      run:
        working-directory: packages/desktop
@@ -136,11 +156,167 @@ jobs:
          registry-url: 'https://registry.npmjs.org'
          node-version-file: '.nvmrc'
          cache: 'yarn'
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: Install FPM
+        run: sudo gem install fpm -f
+
      - run: yarn install --immutable
+
+      - name: Rebuild Electron Native Modules
+        run: yarn workspace @standardnotes/desktop rebuild:home-server
+
      - run: yarn build:desktop
-      - run: yarn run webpack --config desktop.webpack.prod.js
+
      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
-      - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
+
+      - name: Deb
+        run: |
+          yarn run webpack --config desktop.webpack.prod.js --env deb
+          yarn run electron-builder --linux --x64 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
+      - name: DebArm64
+        env:
+          npm_config_target_arch: 'arm64'
+          USE_SYSTEM_FPM: 'true'
+        run: |
+          yarn run webpack --config desktop.webpack.prod.js --env deb
+          yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
+
+      - name: Upload
+        uses: actions/[email protected]
+        with:
+          name: assets
+          path: |
+            packages/desktop/dist/*.deb
+            packages/desktop/dist/*.yml
+            packages/desktop/dist/*.yaml
+
+  Linux-Snap:
+    name: Linux Snap
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/desktop
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: Install FPM
+        run: sudo gem install fpm -f
+
+      - run: yarn install --immutable
+
+      - run: yarn build:desktop
+
+      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
+
+      - name: Install Snapcraft
+        run: |
+          sudo snap install snapcraft --classic
+
+      - name: Setup LXD
+        uses: canonical/[email protected]
+
+      - name: Install Review Tools
+        run: sudo snap install review-tools
+
+      - name: Package Snap
+        run: |
+          yarn run webpack --config desktop.webpack.prod.js --env snap
+          yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
+
+      - name: Review Snap
+        run: review-tools.snap-review dist/standard-notes-${{ env.APP_VERSION }}-linux-amd64.snap
+
+      - name: Upload
+        uses: actions/[email protected]
+        with:
+          name: assets
+          path: |
+            packages/desktop/dist/*.snap
+            packages/desktop/dist/*.yml
+            packages/desktop/dist/*.yaml
+
+  Windows:
+    runs-on: windows-latest
+
+    defaults:
+      run:
+        working-directory: packages/desktop
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install Dependencies
+        run: yarn install --immutable
+
+      - name: Rebuild Electron Native Modules
+        run: yarn workspace @standardnotes/desktop rebuild:home-server
+
+      - name: Build
+        run: yarn build:desktop
+
+      - name: Webpack
+        run: yarn run webpack --config desktop.webpack.prod.js
+
+      - name: Set up certificate
+        run: |
+          echo "${{ secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
+        shell: bash
+
+      - name: Set variables
+        id: variables
+        run: |
+          echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+          echo "KEYPAIR_NAME=snkeypair" >> $GITHUB_OUTPUT
+          echo "CERTIFICATE_NAME=sncertificate" >> $GITHUB_OUTPUT
+          echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
+          echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
+          echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV"
+          echo "SM_CLIENT_CERT_PASSWORD=${{ secrets.SM_CLIENT_CERT_PASSWORD }}" >> "$GITHUB_ENV"
+          echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit" >> $GITHUB_PATH
+          echo "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools" >> $GITHUB_PATH
+          echo "C:\Program Files\DigiCert\DigiCert Keylocker Tools" >> $GITHUB_PATH
+        shell: bash
+
+      - name: Setup Keylocker KSP on windows
+        run: |
+          curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/Keylockertools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o Keylockertools-windows-x64.msi
+          msiexec /i Keylockertools-windows-x64.msi /quiet /qn
+          smksp_registrar.exe list
+          smctl.exe keypair ls
+          C:\Windows\System32\certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
+        shell: cmd
+
+      - name: Certificates Sync
+        run: |
+           smctl windows certsync
+        shell: cmd
+
+      - name: Build & Sign With Electron Builder
+        run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=$(node -p "require('./../web/package.json').version")

      - name: Upload
        uses: actions/[email protected]
@@ -157,7 +333,7 @@ jobs:
    env:
      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
    if: ${{ always() }}
-    needs: [Windows, Mac, Linux]
+    needs: [Windows, Mac, Linux-AppImage, Linux-Dir, Linux-Deb, Linux-Snap]
    defaults:
      run:
        working-directory: packages/desktop
@@ -186,7 +362,6 @@ jobs:
        with:
          package: web desktop
        id: release-notes
-        continue-on-error: true

      - name: Release
        uses: softprops/action-gh-release@v1
@@ -199,6 +374,15 @@ jobs:
          draft: false
          files: packages/desktop/dist/*

+      - name: Publish Snap
+        run: |
+          sudo snap install snapcraft --classic
+          snapcraft upload dist/standard-notes-${{ env.APP_VERSION }}-linux-amd64.snap --release stable,candidate,beta,edge
+
+  Notify:
+    runs-on: ubuntu-latest
+    needs: [Publish]
+    steps:
      - name: Notify Release Update
        uses: peter-evans/repository-dispatch@v2
        with:
@@ -206,8 +390,4 @@ jobs:
          repository: ${{ secrets.RELEASES_EVENT_RECEIVING_REPO }}
          event-type: releases-updated-event

-      - name: Publish Snap
-        continue-on-error: true
-        run: |
-          sudo snap install snapcraft --classic
-          snapcraft upload dist/standard-notes-${{ env.APP_VERSION }}-linux-amd64.snap --release stable,candidate,beta,edge
+
@@ -1,55 +0,0 @@
-name: Desktop Windows Sign & Release
-
-on:
-  workflow_dispatch:
-
-jobs:
-  Windows:
-    runs-on: self-hosted
-    env:
-      WINDOWS_TOKEN_ALIAS: ${{ secrets.WINDOWS_TOKEN_ALIAS }}
-      WINDOWS_TOKEN_PASSWORD: ${{ secrets.WINDOWS_TOKEN_PASSWORD }}
-
-    defaults:
-      run:
-        working-directory: packages/desktop
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          registry-url: 'https://registry.npmjs.org'
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn install --immutable
-      - run: yarn build:desktop
-      - run: yarn run webpack --config desktop.webpack.prod.js
-      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
-      - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
-
-      - name: Upload
-        uses: actions/[email protected]
-        with:
-          name: assets
-          path: |
-            packages/desktop/dist/*.blockmap
-            packages/desktop/dist/*.exe
-            packages/desktop/dist/*.yml
-            packages/desktop/dist/*.yaml
-
-  Publish:
-    runs-on: ubuntu-latest
-    needs: [Windows]
-    defaults:
-      run:
-        working-directory: packages/desktop
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          registry-url: 'https://registry.npmjs.org'
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - uses: actions/download-artifact@v3
-        with:
-          name: assets
-          path: packages/desktop/dist
@@ -5,7 +5,8 @@ on:
    branches: [ main ]

 jobs:
-  Build:
+  build:
+    name: Build & Test
    if: "${{ contains(github.event.head_commit.message, 'chore(release): publish') == false }}"
    runs-on: ubuntu-latest
    steps:
@@ -14,41 +15,43 @@ jobs:
        with:
          token: ${{ secrets.CI_PAT_TOKEN }}
          fetch-depth: 0
-
      - name: Set up Node
        uses: actions/setup-node@v3
        with:
          registry-url: 'https://registry.npmjs.org'
          node-version-file: '.nvmrc'
          cache: 'yarn'
-
-      - name: Setup git config
-        run: |
-          git config --global user.name "standardci"
-          git config --global user.email "[email protected]"
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v4
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.PASSPHRASE }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-
      - name: Install dependencies
        run: yarn install --immutable
-
      - name: Build
        run: yarn build:all
-
      - name: ESLint
        run: yarn lint
-
      - name: Build Android
        run: yarn android:bundle
-
      - name: Test
        run: yarn test

+  build-docker:
+    name: Build Docker Image
+    if: "${{ contains(github.event.head_commit.message, 'chore(release): publish') == false }}"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build
+        run: yarn build:snjs
      - name: Login to Docker Hub
        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
        uses: docker/login-action@v2
@@ -62,7 +65,12 @@ jobs:
          yarn docker build @standardnotes/snjs -t standardnotes/snjs:${{ github.sha }}
          docker push standardnotes/snjs:${{ github.sha }}

-      - name: Run E2E test suite
+  e2e-base:
+    name: E2E Base Test Suite
+    needs: build-docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run E2E base test suite
        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
        uses: convictional/trigger-workflow-and-wait@master
        with:
@@ -71,21 +79,82 @@ jobs:
          github_token: ${{ secrets.CI_PAT_TOKEN }}
          workflow_file_name: e2e-test-suite.yml
          wait_interval: 30
-          client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
+          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "base", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
          propagate_failure: true
          trigger_workflow: true
          wait_workflow: true

+  e2e-vaults:
+    name: E2E Vaults Test Suite
+    needs: build-docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run E2E vaults test suite
+        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
+        uses: convictional/trigger-workflow-and-wait@master
+        with:
+          owner: standardnotes
+          repo: server
+          github_token: ${{ secrets.CI_PAT_TOKEN }}
+          workflow_file_name: e2e-test-suite.yml
+          wait_interval: 30
+          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
+          propagate_failure: true
+          trigger_workflow: true
+          wait_workflow: true
+
+  publish:
+    name: Publish to NPM
+    needs: [e2e-base, e2e-vaults]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Setup git config
+        run: |
+          git config --global user.name "standardci"
+          git config --global user.email "[email protected]"
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v4
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build
+        run: yarn build:all
      - name: Bump version
        run: yarn release:prod
-
      - name: Publish
        run: yarn publish:prod
        env:
          NODE_AUTH_TOKEN: ${{ secrets.CI_NPM_TOKEN }}

+  publish-docker:
+    name: Publish to Docker Hub
+    needs: [e2e-base, e2e-vaults]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to Docker Hub
+        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Publish SNJS Docker image as stable
        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
        run: |
+          docker pull standardnotes/snjs:${{ github.sha }}
          docker tag standardnotes/snjs:${{ github.sha }} standardnotes/snjs:latest
          docker push standardnotes/snjs:latest
@@ -1,4 +1,4 @@
-name: SNJS PR — E2E Tests
+name: SNJS PR — E2E Tests

 on:
  pull_request:
@@ -25,6 +25,38 @@ jobs:
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build
+        run: yarn build:web
+      - name: ESLint
+        run: yarn lint
+      - name: Test
+        run: yarn test
+
+  build-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
      - name: Install dependencies
        run: yarn install --immutable
      - name: Build
@@ -40,6 +72,12 @@ jobs:
          docker push standardnotes/snjs:${{ github.sha }}
          docker tag standardnotes/snjs:${{ github.sha }} standardnotes/snjs:test
          docker push standardnotes/snjs:test
+
+  e2e-base:
+    name: E2E Base Test Suite
+    needs: build-docker
+    runs-on: ubuntu-latest
+    steps:
      - name: Run E2E test suite
        uses: convictional/trigger-workflow-and-wait@master
        with:
@@ -48,7 +86,25 @@ jobs:
          github_token: ${{ secrets.CI_PAT_TOKEN }}
          workflow_file_name: e2e-test-suite.yml
          wait_interval: 30
-          client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
+          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "base", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
+          propagate_failure: true
+          trigger_workflow: true
+          wait_workflow: true
+
+  e2e-vaults:
+    name: E2E Vaults Test Suite
+    needs: build-docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run E2E vaults test suite
+        uses: convictional/trigger-workflow-and-wait@master
+        with:
+          owner: standardnotes
+          repo: server
+          github_token: ${{ secrets.CI_PAT_TOKEN }}
+          workflow_file_name: e2e-test-suite.yml
+          wait_interval: 30
+          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
          propagate_failure: true
          trigger_workflow: true
          wait_workflow: true
--- a/Show More
+++ b/Show More