Skip to content

Commit 655ca6b

Browse files
authored
Merge pull request #563 from Ericzklm/mac-deploy-branch
Mac deploy branch
2 parents 563526b + bfca7b1 commit 655ca6b

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.github/workflows/mac-release.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: SerialPrograms MacOS Release
22

33
on:
4-
push:
5-
tags:
6-
# Start MacOS release flow when a new version tag is created
4+
create:
5+
branch:
6+
# Start MacOS release flow when a new version branch is created
77
- 'v*'
88
workflow_dispatch:
99
# Manual release / testing
@@ -35,7 +35,7 @@ on:
3535

3636
jobs:
3737
build:
38-
runs-on: ${{ github.event.inputs.runner }}
38+
runs-on: ${{ github.event.inputs.runner || 'macos-13'}}
3939
steps:
4040
- name: Checkout Arduino-Source
4141
uses: actions/checkout@v4
@@ -55,9 +55,12 @@ jobs:
5555
brew install tesseract-lang
5656
brew install opencv
5757
58+
- name: Get QT Version
59+
run: echo "QT_VERSION=${{ github.event.inputs.qt_version || '6.8.2' }}" >> $GITHUB_ENV
60+
5861
- uses: jurplel/install-qt-action@v4
5962
with:
60-
version: ${{ github.event.inputs.qt_version }}
63+
version: ${{ env.QT_VERSION }}
6164
modules: 'qtmultimedia qtserialport'
6265

6366
- name: Build SerialPrograms.app
@@ -66,7 +69,7 @@ jobs:
6669
mkdir bin
6770
cd bin
6871
cmake .. -DUNIX_LINK_TESSERACT:BOOL=true -DCMAKE_BUILD_TYPE:STRING=Release
69-
cmake --build . -j ${{ github.event.inputs.jobs }}
72+
cmake --build . -j ${{ github.event.inputs.jobs || 4}}
7073
cp -r SerialPrograms.app ../../../SerialPrograms.app
7174
7275
# Important: GitHub MacOS runners do not have the lib area in its rpath by default. It must manually be added for frameworks to be discovered and added to the bundle
@@ -125,5 +128,5 @@ jobs:
125128
with:
126129
files: SerialPrograms-Installer.dmg
127130
# Tag should be automatically set in the case of a tag push
128-
tag_name: ${{ github.event.inputs.version }}
131+
tag_name: ${{ github.event.inputs.version || github.ref_name }}
129132
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)