Compare commits

...
Author SHA1 Message Date
PiEgg f3ec0cb4be 🎉 Release: v2.3.1-beta.2 2022-01-06 10:42:08 +08:00
PiEgg 5dd6e72b50 🐛 Fix: electron builder actions bug 2022-01-06 00:01:26 +08:00
PiEgg 5cb8151df7 🐛 Fix: linux github actions workflow bug 2022-01-05 23:18:41 +08:00
PiEgg 1848bff091 🎉 Release: v2.3.1-beta.1 2022-01-05 23:13:59 +08:00
PiEgg 56e814a96a 📦 Chore: update ci build scripts 2022-01-05 23:13:24 +08:00
6 changed files with 83 additions and 12 deletions
+1 -2
View File
@@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-12]
os: [ubuntu-latest, macos-11]
# create steps
steps:
@@ -50,7 +50,6 @@ jobs:
- name: Build & release app
run: |
yarn build --arm64
yarn release
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
+52
View File
@@ -0,0 +1,52 @@
# main.yml
# Workflow's name
name: Build
# Workflow's trigger
on: workflow_dispatch
# Workflow's jobs
jobs:
# job's id
release:
# job's name
name: build and release electron app
# the type of machine to run the job on
runs-on: ${{ matrix.os }}
# create a build matrix for jobs
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-11]
# create steps
steps:
# step1: check out repository
- name: Check out git repository
uses: actions/checkout@v2
# step2: install node env
- name: Install Node.js
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
- name: Install system deps
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
# step3: yarn
- name: Yarn install
run: |
yarn
yarn global add xvfb-maybe
- name: Build & release app
run: |
yarn release
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
+19
View File
@@ -1,3 +1,22 @@
## :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)
### :package: Chore
* update ci build scripts ([56e814a](https://github.com/Molunerfinn/PicGo/commit/56e814a))
## :tada: 2.3.1-beta.0 (2022-01-05)
+1 -2
View File
@@ -19,14 +19,13 @@ init:
- git config --global core.autocrlf input
install:
- ps: Install-Product node 12 x64
- ps: Install-Product node 16 x64
- git reset --hard HEAD
- yarn
- node --version
build_script:
#- yarn test
- yarn build --win --ia32
- yarn release
test: false
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "picgo",
"version": "2.3.1-beta.0",
"version": "2.3.1-beta.2",
"private": true,
"scripts": {
"dev": "vue-cli-service electron:serve",
+9 -7
View File
@@ -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'
]
}]
},