maybe fix building macos

cars10 · Apr 23, 2024 · 122f2e3 · 122f2e3
1 parent 29e9566
commit 122f2e3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,9 +25,9 @@ jobs:
       APPLE_TEAM_ID: "${{ secrets.APPLE_TEAM_ID }}"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
           cache: 'yarn'
@@ -36,10 +36,8 @@ jobs:
       - run: rustup toolchain install stable
       - run: rustup target add aarch64-apple-darwin
         if: matrix.platform == 'macos-latest'
-      - uses: swatinem/rust-cache@v2
-        with:
-          workspaces: './src-tauri -> target'
-          key: ${{ matrix.platform }}
+      - run: rustup target add x86_64-apple-darwin
+        if: matrix.platform == 'macos-latest'
 
       - name: (linux) install dependencies
         if: matrix.platform == 'ubuntu-latest'
@@ -48,12 +46,12 @@ jobs:
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 librsvg2-dev patchelf
 
       - name: build apple-silicon app
-        if: matrix.platform == 'macos-latest'
         run: yarn tauri:build --target aarch64-apple-darwin
+        if: matrix.platform == 'macos-latest'
 
       - name: (mac arm) upload .dmg
         if: matrix.platform == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/elasticvue_*_aarch64.dmg
 
@@ -65,15 +63,19 @@ jobs:
 
       - name: (mac arm) upload .app and artifacts
         if: matrix.platform == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_aarch64*
 
       - run: yarn tauri:build
+        if: matrix.platform != 'macos-latest'
+
+      - run: yarn tauri:build --target x86_64-apple-darwin
+        if: matrix.platform == 'macos-latest'
 
       - name: (mac) upload .dmg
         if: matrix.platform == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/release/bundle/dmg/elasticvue_*_x64.dmg
 
@@ -85,38 +87,38 @@ jobs:
 
       - name: (mac) upload .app and artifacts
         if: matrix.platform == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/release/bundle/macos/elasticvue_x64*
 
       - name: (linux) upload .deb
         if: matrix.platform == 'ubuntu-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/release/bundle/deb/elasticvue_*_amd64.deb
 
       - name: (linux) upload .appimage
         if: matrix.platform == 'ubuntu-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/release/bundle/appimage/elasticvue_*_amd64.*
 
       - name: (linux) upload binary
         id: linux_upload_binary
         if: matrix.platform == 'ubuntu-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/release/elasticvue
 
       - name: (windows) upload .msi
         if: matrix.platform == 'windows-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/release/bundle/msi/elasticvue_*_x64*
 
       - name: (windows) upload .exe
         if: matrix.platform == 'windows-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: src-tauri/target/release/elasticvue.exe
 
@@ -130,7 +132,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,6 +15,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: run tests
         run: make CI=1 ci
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.7
+
+This release contains no changes to elasticvue itself. It is only done to fix build issues with the macos desktop
+version.
+
 ## 1.0.6
 
 * double click to edit search results, fixes [#225](https://github.com/cars10/elasticvue/issues/225)