mirror of
https://github.com/Molunerfinn/PicGo.git
synced 2024-04-21 10:31:33 +00:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f3ec0cb4be | ||
|
|
5dd6e72b50 | ||
|
|
5cb8151df7 | ||
|
|
1848bff091 | ||
|
|
56e814a96a |
@@ -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 }}
|
||||
|
||||
@@ -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 }}
|
||||
@@ -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
@@ -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
@@ -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
@@ -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