Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tamlok committed May 21, 2024
1 parent da25d09 commit 0fddceb
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
24 changes: 18 additions & 6 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,21 @@ env:
jobs:
build:
name: Build On MacOS
runs-on: macos-latest
timeout-minutes: 120

strategy:
fail-fast: false
matrix:
config:
- name: "Build on x64"
os: macos-latest-large
arch: x64
- name: "Build on Arm64"
os: macos-latest
arch: arm64

runs-on: ${{matrix.config.os}}

steps:
# Checks-out your repository under $GITHUB_WORKSPACE.
- uses: actions/checkout@v2
Expand Down Expand Up @@ -90,7 +102,7 @@ jobs:
cmake --build . --target pack
ls -ls .
ls -ls src
mv src/vnote.dmg VNote-${{env.VNOTE_VER}}-mac.dmg
mv src/vnote.dmg VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
working-directory: ${{runner.workspace}}/build

# Enable tmate debugging of manually-triggered workflows if the input option was provided
Expand All @@ -101,8 +113,8 @@ jobs:
- name: Archive Artifacts
uses: actions/upload-artifact@v2
with:
name: VNote-${{env.VNOTE_VER}}-mac
path: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac.dmg
name: VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}
path: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg

- name: Update Tag
if: github.ref == 'refs/heads/master'
Expand All @@ -115,7 +127,7 @@ jobs:
uses: johnwbyrd/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac.dmg
files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
release: Continuous Build
tag: continuous-build

Expand All @@ -124,7 +136,7 @@ jobs:
uses: ncipollo/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac.dmg
artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
commit: master
tag: v${{env.VNOTE_VER}}
allowUpdates: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ jobs:
fail-fast: false
matrix:
config:
- name: "Build On Win64 Qt 5.15"
- name: "Build on Win64 Qt 5.15"
arch: win64_msvc2019_64
qt: 5.15.2
qt_modules: qtwebengine
qt_tools: tools_opensslv3_x64
qt_major: 5
suffix: "-windows7"
- name: "Build On Win64 Qt 6.5"
- name: "Build on Win64 Qt 6.5"
arch: win64_msvc2019_64
qt: 6.5.3
qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat"
Expand Down

0 comments on commit 0fddceb

Please sign in to comment.