mirror of
https://github.com/Molunerfinn/PicGo.git
synced 2024-04-21 10:31:33 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f3ec0cb4be | ||
|
|
5dd6e72b50 | ||
|
|
5cb8151df7 |
@@ -48,14 +48,8 @@ jobs:
|
||||
yarn
|
||||
yarn global add xvfb-maybe
|
||||
|
||||
- name: Build & release app linux
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
- name: Build & release app
|
||||
run: |
|
||||
yarn release
|
||||
- name: Build & release app mac
|
||||
if: matrix.os == 'macos-11'
|
||||
run: |
|
||||
yarn build --arm64
|
||||
yarn release
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
|
||||
@@ -45,14 +45,8 @@ jobs:
|
||||
yarn
|
||||
yarn global add xvfb-maybe
|
||||
|
||||
- name: Build & release app linux
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
- name: Build & release app
|
||||
run: |
|
||||
yarn release
|
||||
- name: Build & release app mac
|
||||
if: matrix.os == 'macos-11'
|
||||
run: |
|
||||
yarn build --arm64
|
||||
yarn release
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
## :tada: 2.3.1-beta.2 (2022-01-06)
|
||||
|
||||
|
||||
### :bug: Bug Fixes
|
||||
|
||||
* electron builder actions bug ([5dd6e72](https://github.com/Molunerfinn/PicGo/commit/5dd6e72))
|
||||
* linux github actions workflow bug ([5cb8151](https://github.com/Molunerfinn/PicGo/commit/5cb8151))
|
||||
|
||||
|
||||
|
||||
## :tada: 2.3.1-beta.1 (2022-01-05)
|
||||
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@ install:
|
||||
|
||||
build_script:
|
||||
#- yarn test
|
||||
- yarn build --win --ia32
|
||||
- yarn release
|
||||
|
||||
test: false
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "picgo",
|
||||
"version": "2.3.1-beta.1",
|
||||
"version": "2.3.1-beta.2",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vue-cli-service electron:serve",
|
||||
|
||||
+9
-7
@@ -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'
|
||||
]
|
||||
}]
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user