From 861eb5b2a0cbe6898f40e954fbb1d4d4b0a999a3 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Tue, 1 Apr 2025 22:15:42 -0700 Subject: [PATCH 1/3] Deploy on Branch Creation Repo uses branches to record versions rather than tags --- .github/workflows/mac-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mac-release.yml b/.github/workflows/mac-release.yml index 9b2979278d..89d75e1004 100644 --- a/.github/workflows/mac-release.yml +++ b/.github/workflows/mac-release.yml @@ -1,9 +1,9 @@ name: SerialPrograms MacOS Release on: - push: - tags: - # Start MacOS release flow when a new version tag is created + create: + branch: + # Start MacOS release flow when a new version branch is created - 'v*' workflow_dispatch: # Manual release / testing @@ -125,5 +125,5 @@ jobs: with: files: SerialPrograms-Installer.dmg # Tag should be automatically set in the case of a tag push - tag_name: ${{ github.event.inputs.version }} + tag_name: ${{ github.event.inputs.version || github.ref_name }} token: ${{ secrets.GITHUB_TOKEN }} From ee9f8fe16f80ce3837156fe997819d06dd48ede3 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Tue, 1 Apr 2025 22:25:08 -0700 Subject: [PATCH 2/3] Defaults on Automatic Mac Deployment --- .github/workflows/mac-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mac-release.yml b/.github/workflows/mac-release.yml index 89d75e1004..5d53962c59 100644 --- a/.github/workflows/mac-release.yml +++ b/.github/workflows/mac-release.yml @@ -35,7 +35,7 @@ on: jobs: build: - runs-on: ${{ github.event.inputs.runner }} + runs-on: ${{ github.event.inputs.runner || 'macos-13'}} steps: - name: Checkout Arduino-Source uses: actions/checkout@v4 @@ -57,7 +57,7 @@ jobs: - uses: jurplel/install-qt-action@v4 with: - version: ${{ github.event.inputs.qt_version }} + version: ${{ github.event.inputs.qt_version || "6.8.2"}} modules: 'qtmultimedia qtserialport' - name: Build SerialPrograms.app @@ -66,7 +66,7 @@ jobs: mkdir bin cd bin cmake .. -DUNIX_LINK_TESSERACT:BOOL=true -DCMAKE_BUILD_TYPE:STRING=Release - cmake --build . -j ${{ github.event.inputs.jobs }} + cmake --build . -j ${{ github.event.inputs.jobs || 4}} cp -r SerialPrograms.app ../../../SerialPrograms.app # 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 From bfca7b1df6ebaf89cdc2fb759b6052af1d2bd681 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Tue, 1 Apr 2025 22:37:29 -0700 Subject: [PATCH 3/3] Default QT Version --- .github/workflows/mac-release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mac-release.yml b/.github/workflows/mac-release.yml index 5d53962c59..d364663b9d 100644 --- a/.github/workflows/mac-release.yml +++ b/.github/workflows/mac-release.yml @@ -55,9 +55,12 @@ jobs: brew install tesseract-lang brew install opencv + - name: Get QT Version + run: echo "QT_VERSION=${{ github.event.inputs.qt_version || '6.8.2' }}" >> $GITHUB_ENV + - uses: jurplel/install-qt-action@v4 with: - version: ${{ github.event.inputs.qt_version || "6.8.2"}} + version: ${{ env.QT_VERSION }} modules: 'qtmultimedia qtserialport' - name: Build SerialPrograms.app