fix: also build x86 macos & update deps

Signed-off-by: Martichou <[email protected]>
Martichou · Jul 14, 2024 · 037100a · 037100a
1 parent 0fc7021
commit 037100a
Show file tree

Hide file tree

Showing 11 changed files with 170 additions and 119 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install dependencies
-        if: matrix.os != 'macos-latest'
+        if: contains(matrix.os, 'macos') == false
         run: |
           sudo apt-get update
           sudo apt-get install -y libdbus-1-dev
@@ -65,6 +65,11 @@ jobs:
             cache_directory: app/main/src-tauri/target
             build_cmd: dmg:build
             generated_bundle: dmg/RQuickShare_*.dmg
+          - os: macos-13
+            target_path: app/main
+            cache_directory: app/main/src-tauri/target
+            build_cmd: dmg:build
+            generated_bundle: dmg/RQuickShare_*.dmg
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
@@ -81,15 +86,15 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install Linux dependencies for U
-        if: matrix.os != 'macos-latest'
+        if: contains(matrix.os, 'macos') == false
         run: |
           sudo apt-get update
           sudo apt-get install -y libdbus-1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev
       - name: Install Linux dependencies
-        if: matrix.os != 'macos-latest'
+        if: contains(matrix.os, 'macos') == false
         run: ${{ matrix.dependencies }}
       - name: GLIBC version
-        if: matrix.os != 'macos-latest'
+        if: contains(matrix.os, 'macos') == false
         run: |
           GLIBC_VER=$(ldd --version | head -n1 | awk '{print $NF}')
           echo "GLIBC version: ${GLIBC_VER}"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,6 +32,10 @@ jobs:
             name: main
             target_path: app/main
             cache_directory: app/main/src-tauri/target
+          - os: macos-13
+            name: main
+            target_path: app/main
+            cache_directory: app/main/src-tauri/target
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
@@ -49,12 +53,12 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Linux dependencies for U
-        if: matrix.os != 'macos-latest'
+        if: contains(matrix.os, 'macos') == false
         run: |
           sudo apt-get update
           sudo apt-get install -y libdbus-1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev
       - name: Install Linux dependencies
-        if: matrix.os != 'macos-latest'
+        if: contains(matrix.os, 'macos') == false
         run: ${{ matrix.dependencies }}
 
       - name: Build Vite + Tauri