Unblock frontends, build workflows

Synchronize CI workflows Unset default-members to build and clippy everything
fiberplane · Sep 17, 2024 · 601de15 · 601de15
1 parent 23fe3e1
commit 601de15
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 44 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,7 +1,6 @@
 # Test and build the project.
 ---
-name: Build
-
+name: Build cli
 on:
   # Allow manual trigger
   workflow_dispatch:
@@ -12,23 +11,17 @@ on:
 
   # Run on every push to main
   push:
-    branches: ["main"]
+    branches: ["main", "tauri-main"]
 
 jobs:
   build:
+    name: Create binary for ${{ matrix.target }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
-          - target: x86_64-unknown-linux-gnu
-            os: ubuntu-latest-8-cores
-
-    name: Create binary for ${{ matrix.target }}
-    runs-on: ${{ matrix.os }}
-    env:
-      CARGO: cargo
-      TARGET_FLAGS: ""
-      TARGET_DIR: ../target
-      RUST_BACKTRACE: 1
+          - os: ubuntu-latest-8-cores
+            target: x86_64-unknown-linux-gnu
 
     permissions:
       id-token: write

diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml
@@ -5,9 +5,13 @@ on:
   # Allow manual trigger
   workflow_dispatch:
 
+  # Run on every pull request
+  pull_request:
+    branches: ["*"]
+
   # Run on every push to main
   push:
-    branches: ["main", "tauri-main", "tauri-ci"]
+    branches: ["main", "tauri-main"]
 
 jobs:
   build-app:
@@ -22,8 +26,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - os: ubuntu-latest-8-cores
-          #   target: aarch64-unknown-linux-gnu
           - os: ubuntu-latest-8-cores
             target: x86_64-unknown-linux-gnu
             bundles: appimage
@@ -48,15 +50,17 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: latest
+          version: 9
+          run_install: false
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: "pnpm"
 
       - name: Setup Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -72,9 +76,11 @@ jobs:
 
       - name: Install dependencies
         run: pnpm install
+        env:
+          CI: true
 
-      - name: Build fiberplane/fpx-types
-        run: pnpm run build:types
+      - name: Build shared types
+        run: pnpm build:types
 
       - name: Build fpx-app
         run: |
@@ -83,24 +89,6 @@ jobs:
             --target "${{ matrix.target }}" \
             --bundles "${{ matrix.bundles }}"
 
-      # - name: Build fpx app
-      #   uses: tauri-apps/tauri-action@v0
-      #   id: tauri
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     args: "--target ${{ matrix.target }} --ci"
-
-      # - name: Prepare artifacts
-      #   run: |
-      #     mkdir artifacts
-      #     paths=$(echo '${{ steps.tauri.outputs.artifactPaths }}' | jq -c -r '.[]')
-
-      #     for artifact in $paths; do
-      #       echo "Moving $artifact"
-      #       mv $artifact artifacts
-      #     done
-
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/build_frontends.yml b/.github/workflows/build_frontends.yml
@@ -14,11 +14,16 @@ env:
 jobs:
   build_packages:
     name: Build packages
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install dependencies (Linux)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
@@ -41,6 +46,9 @@ jobs:
         env:
           CI: true
 
+      - name: Setup Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+
       - name: Build shared types
         run: pnpm build:types
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,6 @@
 [workspace]
 resolver = "2"
 members = ["fpx", "fpx-app", "fpx-cli", "fpx-macros", "fpx-workers", "xtask"]
-default-members = ["fpx-cli"]
 
 [workspace.package]
 authors = ["Fiberplane <info@fiberplane.com>"]