fix ci

asrient · Nov 20, 2023 · 0e98598 · 0e98598
1 parent acce63f
commit 0e98598
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/desktop-publish.yml b/.github/workflows/desktop-publish.yml
@@ -2,8 +2,7 @@ name: App CI
 
 on:
   push:
-    branches: [ "main" ]
-    tags: [ "v*" ]
+    tags: [ "v*", "desktop-v*" ]
 
 jobs:
   build-and-publish:
@@ -48,22 +47,18 @@ jobs:
           ONEAUTH_SERVER_URL: ${{ secrets.ONEAUTH_SERVER_URL }}
           ONEAUTH_APP_ID: ${{ secrets.ONEAUTH_APP_ID }}
           NODE_OPTIONS: "--max_old_space_size=4096"
-      - name: Make app
+      - name: Publish app
         if: matrix.os != 'macos-latest'
-        run: npm run make:desktop
+        run: npm run publish:desktop
         working-directory: ./apps
         env:
           NODE_ENV: production
-      - name: Make app - MacOS
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+      - name: Publish app - MacOS
         if: matrix.os == 'macos-latest'
-        run: npm run make:desktop:macos
+        run: npm run publish:desktop:macos
         working-directory: ./apps
         env:
           NODE_ENV: production
-          NODE_OPTIONS: "--max_old_space_size=4096"
-      - name: Publish app
-        run: npm run publish:desktop
-        working-directory: ./apps
-        env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          NODE_ENV: production
+          NODE_OPTIONS: "--max_old_space_size=4096"
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,8 +2,7 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "main" ]
-    tags: [ "v*" ]
+    tags: [ "v*", "server-v*" ]
 
 jobs:
   build-server:

diff --git a/apps/package.json b/apps/package.json
@@ -24,8 +24,8 @@
     "start:desktop": "npm run build && electron-forge start",
     "package:desktop": "electron-forge package",
     "make:desktop": "electron-forge make",
-    "make:desktop:macos": "electron-forge make --arch arm64,x64",
-    "publish:desktop": "electron-forge publish"
+    "publish:desktop": "electron-forge publish",
+    "publish:desktop:macos": "electron-forge publish --arch \"arm64,x64\""
   },
   "dependencies": {
     "ajv": "^8.12.0",