From b55e93c7c10071ed53ba3ac3804147c0dc0a4f27 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sun, 21 Jul 2024 08:35:47 +0300
Subject: [PATCH] ci: Join workflows

---
 .github/workflows/build.yml   |  3 ---
 .github/workflows/main.yml    | 18 ++++++++++++++++++
 .github/workflows/release.yml | 28 ----------------------------
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index e5c6fb1ae..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-on:
-    workflow_call:
-
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3eb4d172a..d1852bc41 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -115,6 +115,24 @@ jobs:
         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
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "npm"
+      - run: npm ci
+      - name: Run installer build
+        run: npm run make-electron
+      - name: Publish installer artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: TriliumNext Notes for Windows (Setup)
+          path: out/make/squirrel.windows/x64/*.exe
   build_docker:
     name: Build Docker image
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index ee9ea0234..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Release
-
-on:
-  push:
-
-jobs:
-  build-windows-installer:
-    name: Build Windows Installer
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      
-      - name: Set up node & dependencies
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: "npm"
-      - run: npm ci
-      
-      - name: Run installer build
-        run: npm run make-electron
-      
-      - name: Publish installer artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: TriliumNext Notes for Windows (.exe)
-          path: out/make/squirrel.windows/x64/*.exe
\ No newline at end of file