mergey merge

.github/pr-labeler.yml

@@ -10,12 +10,13 @@ rust:
 
 "@gitbutler/web":
 - changed-files:
-  - any-glob-to-any-file: app/web/**/*
+  - any-glob-to-any-file: apps/web/**/*
 
 "@gitbutler/ui":
 - changed-files:
   - any-glob-to-any-file: packages/ui/**/*
 
 "@gitbutler/design-tokens":
 - changed-files:
-  - any-glob-to-any-file: packages/design-tokens/**/*
+  - any-glob-to-any-file: packages/design-tokens/**/*
+

.github/workflows/test-e2e.yml

@@ -1,4 +1,4 @@
-name: Playwright Tests
+name: E2E Tests
 on:
   schedule:
     - cron: "0 6 * * *"
@@ -9,34 +9,38 @@ on:
     branches: [master]
 
 jobs:
-  playwright:
-    timeout-minutes: 60
+  test:
+    name: Run WebdriverIO Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/init-env-node
-      - name: Get installed Playwright version
-        id: playwright-version
-        run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./apps/desktop/package.json').devDependencies['@playwright/test'].substring(1))")" >> $GITHUB_ENV
-      - name: Cache playwright binaries
-        uses: actions/cache@v4
-        id: playwright-cache
+      - name: Install Tauri OS dependencies
+        run: |
+          sudo apt update && sudo apt install -y \
+            libgtk-3-dev \
+            libayatana-appindicator3-dev \
+            libwebkit2gtk-4.0-dev \
+            webkit2gtk-driver \
+            xvfb
+      - name: Setup rust-toolchain stable
+        uses: dtolnay/rust-toolchain@stable
+      - name: Setup node latest
+        uses: actions/setup-node@v4
         with:
-          path: |
-            ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
-      - name: Install Playwright Browsers
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: pnpm dlx "playwright@$PLAYWRIGHT_VERSION" install --with-deps chromium
-      - name: Run Tests
-        run: cd apps/desktop && pnpm test:e2e
-        env:
-          CI: true
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
-        with:
-          name: playwright-report
-          path: apps/desktop/test-results/**/trace.zip
-          if-no-files-found: ignore
-          retention-days: 30
+          node-version: latest
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+      - name: Install dependencies
+        shell: bash
+        run: pnpm install
+      - name: Build SvelteKit
+        run: pnpm build:desktop -- --mode development
+      - name: Build Tauri
+        run: pnpm build:test
+      - name: Install tauri-driver
+        run: cargo install tauri-driver@0.1.3
+
+      # Run it through `xvfb-run` to have a fake display server which allows our
+      # application to run headless without any changes to the code
+      - name: WebdriverIO
+        run: xvfb-run pnpm test:e2e

.gitignore

@@ -3,10 +3,10 @@ target/
 generated-archives/
 generated-do-not-edit/
 
-
 # editors
 .idea
 
+.sentryclirc
 .DS_Store
 
 .env
@@ -48,4 +48,4 @@ storybook-static
 .vercel
 
 # Rust analyzer
-.rust-analyzer/
+.rust-analyzer/