From 46164de94ae6cf98b81e59b597b5aa03e01af318 Mon Sep 17 00:00:00 2001
From: Jin <22962980+JYC333@users.noreply.github.com>
Date: Mon, 5 Aug 2024 20:29:17 +0200
Subject: [PATCH] fix github action

---
 .github/workflows/main.yml | 95 +++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4ba5be90b..a4b44ec1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,9 +20,9 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build_darwin-x64:
-    name: Build macOS x86_64
-    runs-on: ubuntu-latest
+  build_darwin:
+    name: Build macOS
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up node & dependencies
@@ -33,29 +33,27 @@ jobs:
       - run: npm ci
       - run: |
           npm run update-build-info
-          ./bin/build-mac-x64.sh
-      - uses: actions/upload-artifact@v4
+          npm run make-electron
+      - name: Publish zip artifact (x86_64)
+        uses: actions/upload-artifact@v4
         with:
-          name: trilium-mac-x64.zip
-          path: dist/trilium-mac-x64*.zip
-  build_darwin-arm64:
-    name: Build macOS aarch64
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up node & dependencies
-        uses: actions/setup-node@v4
+          name: TriliumNext Notes for MacOS (x86_64)
+          path: out/make/darwin/x64/*.zip
+      - name: Publish zip artifact (arm64)
+        uses: actions/upload-artifact@v4
         with:
-          node-version: 20
-          cache: "npm"
-      - run: npm ci
-      - run: |
-          npm run update-build-info
-          ./bin/build-mac-arm64.sh
-      - uses: actions/upload-artifact@v4
+          name: TriliumNext Notes for MacOS (arm64)
+          path: out/make/darwin/arm64/*.zip
+      - name: Publish installer artifact (x86_64)
+        uses: actions/upload-artifact@v4
         with:
-          name: trilium-mac-arm64.zip
-          path: dist/trilium-mac-arm64*.zip
+          name: TriliumNext Notes for MacOS (Setup) (x86_64)
+          path: out/make/dmg/x64/*.dmg
+      - name: Publish installer artifact (arm64)
+        uses: actions/upload-artifact@v4
+        with:
+          name: TriliumNext Notes for MacOS (Setup) (arm64)
+          path: out/make/dmg/arm64/*.dmg
   build_linux-x64:
     name: Build Linux x86_64
     runs-on: ubuntu-latest
@@ -67,17 +65,20 @@ jobs:
           node-version: 20
           cache: "npm"
       - run: npm ci
-      - run: |
+      - name: Run installer build
+        run: |
           npm run update-build-info
-          ./bin/build-linux-x64.sh
-      - uses: actions/upload-artifact@v4
+          npm run make-electron
+      - name: Publish zip artifact
+        uses: actions/upload-artifact@v4
         with:
-          name: trilium-linux-x64.tar.xz
-          path: dist/trilium-linux-x64-*.tar.xz
-      - uses: actions/upload-artifact@v4
+          name: TriliumNext Notes for Linux
+          path: out/make/zip/linux/x64/*.zip
+      - name: Publish installer artifact
+        uses: actions/upload-artifact@v4
         with:
-          name: trilium_amd64.deb
-          path: dist/trilium_*.deb
+          name: TriliumNext Notes for Linux (Setup)
+          path: out/make/deb/x64/*.deb
   build_linux_server-x64:
     name: Build Linux Server x86_64
     runs-on: ubuntu-latest
@@ -96,33 +97,8 @@ jobs:
         with:
           name: trilium-linux-x64-server.tar.xz
           path: dist/trilium-linux-x64-server-*.tar.xz
-  build_windows-x64:
+  build_windows:
     name: Build Windows x86_64
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Wine
-        run: |
-          sudo dpkg --add-architecture i386
-          wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
-          sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
-          sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
-          sudo apt install --install-recommends winehq-stable
-      - uses: actions/checkout@v4
-      - name: Set up node & dependencies
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: "npm"
-      - run: npm ci
-      - run: |
-          npm run update-build-info
-          ./bin/build-win-x64.sh DONTPACK
-      - uses: actions/upload-artifact@v4
-        with:
-          name: trilium-windows-x64
-          path: dist/trilium-windows-x64
-  build_windows-installer:
-    name: Build Windows x86_64 (Setup)
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
@@ -136,6 +112,11 @@ jobs:
         run: |
           npm run update-build-info
           npm run make-electron
+      - name: Publish zip artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: TriliumNext Notes for Windows
+          path: out/make/zip/win32/x64/*.zip
       - name: Publish installer artifact
         uses: actions/upload-artifact@v4
         with: