Resolve PR Conflicts

.github/PULL_REQUEST_TEMPLATE.md

@@ -22,4 +22,9 @@
 
 Closes # Fixes #
 
+## Checklist
+
+- [ ] I have read and will follow the [Code of Conduct](../CODE_OF_CONDUCT.md).
+- [ ] I have read and agree to the
+      [Contributor License and Feedback Agreement](../CONTRIBUTOR_LICENSE_AND_FEEDBACK_AGREEMENT.md).
 

.github/workflows/rust.yml → .github/workflows/ci.yml

@@ -1,25 +1,52 @@
-name: Rust CI
+name: CI
 
 on:
   push:
-    branches: [main, master]
+    branches: [master]
   pull_request:
-    branches: [main, master]
+    branches: [master]
   workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
-env:
-  CARGO_TERM_COLOR: always
-
 jobs:
-  check:
-    # Don't run on forks
+  bun:
+    if: github.repository == 'athasdev/athas'
+    name: Bun — typecheck, lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Cache Bun dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.bun/install/cache
+          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-
+
+      - name: Install dependencies
+        run: bun install
+
+      - name: Run typecheck
+        run: bun typecheck
+
+      - name: Run biome check
+        run: bun check
+
+  rust:
     if: github.repository == 'athasdev/athas'
-    name: check format and cargo check
+    name: Rust — fmt, cargo check
     runs-on: ubuntu-latest
+    env:
+      CARGO_TERM_COLOR: always
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/release.yml

@@ -19,22 +19,46 @@
       matrix:
         include:
           - platform: 'macos-latest'
+            os: 'macos'
             args: '--target aarch64-apple-darwin'
             target: 'aarch64-apple-darwin'
           - platform: 'macos-latest'
+            os: 'macos'
             args: '--target x86_64-apple-darwin'
             target: 'x86_64-apple-darwin'
           - platform: 'ubuntu-22.04'
+            os: 'linux'
+            args: ''
+            target: ''
+          - platform: 'ubuntu-22.04-arm'
+            os: 'linux'
             args: ''
             target: ''
           - platform: 'windows-latest'
+            os: 'windows'
             args: ''
             target: ''
+          - platform: 'windows-latest'
+            os: 'windows'
+            args: '--target aarch64-pc-windows-msvc'
+            target: 'aarch64-pc-windows-msvc'
 
     runs-on: ${{ matrix.platform }}
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@v4
 
+      - name: Free disk space (Linux only)
+        if: matrix.os == 'linux'
+        run: |
+          echo "Disk usage before cleanup:"
+          df -h
+          sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/lib/android /opt/hostedtoolcache/CodeQL || true
+          sudo docker system prune -af || true
+          sudo apt-get clean
+          echo "Disk usage after cleanup:"
+          df -h
+
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
         with:
@@ -45,13 +69,10 @@
         with:
           targets: ${{ matrix.target }}
 
-      - name: Add additional Rust targets
-        if: matrix.target != ''
-        run: rustup target add ${{ matrix.target }}
-
-
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
 
       - name: Cache Bun dependencies
         uses: actions/cache@v4
@@ -61,17 +82,21 @@
           restore-keys: |
             ${{ runner.os }}-bun-
 
-      - name: Install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04'
+      - name: Install dependencies (Linux only)
+        if: matrix.os == 'linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libfuse2
+
+      - name: Configure AppImage runtime (Linux only)
+        if: matrix.os == 'linux'
+        run: echo "APPIMAGE_EXTRACT_AND_RUN=1" >> "$GITHUB_ENV"
 
       - name: Install frontend dependencies
         run: bun install
 
       - name: Import Apple Certificate (macOS only)
-        if: matrix.platform == 'macos-latest'
+        if: matrix.os == 'macos'
         env:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERT_PASSWORD: ${{ secrets.APPLE_CERT_PASSWORD }}
@@ -102,9 +127,9 @@
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_ID: ${{ matrix.os == 'macos' && secrets.APPLE_ID || '' }}
+          APPLE_PASSWORD: ${{ matrix.os == 'macos' && secrets.APPLE_PASSWORD || '' }}
+          APPLE_TEAM_ID: ${{ matrix.os == 'macos' && secrets.APPLE_TEAM_ID || '' }}
         with:
           tagName: v__VERSION__
           releaseName: 'Athas v__VERSION__'
@@ -123,3 +148,13 @@
           prerelease: false
           includeUpdaterJson: true
           args: ${{ matrix.args }}
+
+  deploy-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger docs rebuild on www
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.WWW_DEPLOY_TOKEN }}
+          repository: athasdev/www
+          event-type: docs-updated