🐛 Fix: electron builder actions bug

Molunerfinn · Jan 5, 2022 · 5dd6e72 · 5dd6e72
1 parent 5cb8151
commit 5dd6e72
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -48,16 +48,8 @@ jobs:
           yarn
           yarn global add xvfb-maybe
 
-      - name: Build  & release app linux
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          yarn release
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      - name: Build & release app mac
-        if: matrix.os == 'macos-11'
+      - name: Build  & release app
         run: |
-          yarn build --arm64
           yarn release
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/manually.yml b/.github/workflows/manually.yml
@@ -45,16 +45,8 @@ jobs:
           yarn
           yarn global add xvfb-maybe
 
-      - name: Build  & release app linux
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          yarn release
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      - name: Build & release app mac
-        if: matrix.os == 'macos-11'
+      - name: Build  & release app
         run: |
-          yarn build --arm64
           yarn release
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/appveyor.yml b/appveyor.yml
@@ -26,7 +26,6 @@ install:
 
 build_script:
   #- yarn test
-  - yarn build --win --ia32
   - yarn release
 
 test: false
diff --git a/vue.config.js b/vue.config.js
@@ -3,9 +3,6 @@ function resolve (dir) {
   return path.join(__dirname, dir)
 }
 
-const arch = process.argv.includes('--ia32') ? 'ia32' : 'x64'
-const macArch = process.argv.includes('--arm64') ? 'arm64' : 'x64'
-
 const config = {
   configureWebpack: {
     devtool: 'nosources-source-map'
@@ -69,18 +66,23 @@ const config = {
           },
           target: [{
             target: 'dmg',
-            arch: macArch
+            arch: [
+              'x64',
+              'arm64'
+            ]
           }],
-          artifactName: `PicGo-\${version}-${macArch}.dmg`
+          // eslint-disable-next-line no-template-curly-in-string
+          artifactName: 'PicGo-${version}-${arch}.dmg'
         },
         win: {
           icon: 'build/icons/icon.ico',
           // eslint-disable-next-line no-template-curly-in-string
-          artifactName: `PicGo Setup \${version}-${arch}.exe`,
+          artifactName: 'PicGo Setup ${version}-${arch}.exe',
           target: [{
             target: 'nsis',
             arch: [
-              arch
+              'x64',
+              'ia32'
             ]
           }]
         },