🐛 Fix: electron builder actions bug

This commit is contained in:
PiEgg 2022-01-06 00:01:26 +08:00
parent 5cb8151df7
commit 5dd6e72b50
4 changed files with 11 additions and 26 deletions

View File

@ -48,16 +48,8 @@ jobs:
yarn yarn
yarn global add xvfb-maybe yarn global add xvfb-maybe
- name: Build & release app linux - name: Build & release app
if: matrix.os == 'ubuntu-latest'
run: | run: |
yarn release yarn release
env: env:
GH_TOKEN: ${{ secrets.GH_TOKEN }} GH_TOKEN: ${{ secrets.GH_TOKEN }}
- name: Build & release app mac
if: matrix.os == 'macos-11'
run: |
yarn build --arm64
yarn release
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}

View File

@ -45,16 +45,8 @@ jobs:
yarn yarn
yarn global add xvfb-maybe yarn global add xvfb-maybe
- name: Build & release app linux - name: Build & release app
if: matrix.os == 'ubuntu-latest'
run: | run: |
yarn release yarn release
env: env:
GH_TOKEN: ${{ secrets.GH_TOKEN }} GH_TOKEN: ${{ secrets.GH_TOKEN }}
- name: Build & release app mac
if: matrix.os == 'macos-11'
run: |
yarn build --arm64
yarn release
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}

View File

@ -26,7 +26,6 @@ install:
build_script: build_script:
#- yarn test #- yarn test
- yarn build --win --ia32
- yarn release - yarn release
test: false test: false

View File

@ -3,9 +3,6 @@ function resolve (dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir)
} }
const arch = process.argv.includes('--ia32') ? 'ia32' : 'x64'
const macArch = process.argv.includes('--arm64') ? 'arm64' : 'x64'
const config = { const config = {
configureWebpack: { configureWebpack: {
devtool: 'nosources-source-map' devtool: 'nosources-source-map'
@ -69,18 +66,23 @@ const config = {
}, },
target: [{ target: [{
target: 'dmg', 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: { win: {
icon: 'build/icons/icon.ico', icon: 'build/icons/icon.ico',
// eslint-disable-next-line no-template-curly-in-string // eslint-disable-next-line no-template-curly-in-string
artifactName: `PicGo Setup \${version}-${arch}.exe`, artifactName: 'PicGo Setup ${version}-${arch}.exe',
target: [{ target: [{
target: 'nsis', target: 'nsis',
arch: [ arch: [
arch 'x64',
'ia32'
] ]
}] }]
}, },