From 7eaa72529ac122b240e440cc37539130a659be8d Mon Sep 17 00:00:00 2001 From: M Gray Date: Sun, 2 Mar 2025 18:31:51 +0000 Subject: [PATCH 1/3] Added MacOS 13 builder To combat the "application can not run on this version of MacOS" errors - due to latest have a minimum compat version of MacOS 14 - we need to add another builder to ship an "Up-to-13.7" build. --- .github/workflows/Build.yml | 45 ++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 4026061..1867682 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -188,9 +188,52 @@ jobs: LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}" uses: actions/upload-artifact@v4 with: - name: LibreVNA-GUI-OSX-${{env.LIBREVNA_VERSION}} + name: LibreVNA-GUI-OSX-latest-${{env.LIBREVNA_VERSION}} path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip + + PC_Application_OSX_13: + runs-on: macos-13 + steps: + - uses: actions/checkout@v4 + + - name: Install dependencies + run: | + brew install qt@6 pcre + - name: Set Environment + run: | + echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH + + - name: Get build timestamp + id: id_date + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT + + - name: Get app version + id: id_version + run: | + cd Software/PC_Application/LibreVNA-GUI + fw_major=`pcregrep -o '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` + fw_minor=`pcregrep -o '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro` + fw_patch=`pcregrep -o '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` + echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT + + - name: Build application + run: | + cd Software/PC_Application/LibreVNA-GUI + qmake LibreVNA-GUI.pro + make -j9 + macdeployqt LibreVNA-GUI.app + zip -ry LibreVNA-GUI.zip LibreVNA-GUI.app + shell: bash + + - name: Upload artifact + env: + LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}" + uses: actions/upload-artifact@v4 + with: + name: LibreVNA-GUI-OSX-13.7-${{env.LIBREVNA_VERSION}} + path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip + Embedded_Firmware: runs-on: ubuntu-20.04 steps: From 8c3b76e2d0786d6bc50d70a1ce65ad911da260b9 Mon Sep 17 00:00:00 2001 From: M Gray Date: Sun, 2 Mar 2025 18:47:30 +0000 Subject: [PATCH 2/3] Reflect multiple MacOS builds in docs Added MacOS details to readme to reflect MacOS 14+ and 13.7 builds --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 6c1ee8a..b81ede4 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,14 @@ cd $UNPACKED_ZIP_FOLDER$ ./LibreVNA-GUI ``` +### MacOS +* Download the latest [Release](https://github.com/jankae/LibreVNA/releases) + * If you are using MacOS 14+ use the release with `latest` in the name. + * If you are using MacOS >13.7 use the release with `13.7` in the name. +* Unpack the zip file and move LibreVNA-GUI.app to your `/Applications` folder. +* Start LibreVNA-GUI.app and add a security exception to allow the Mac to run the app with an "untrusted" signing key. +* Launch app again. + ## Quick Start * You can find released versions of the GUI application and the device firmware [here](https://github.com/jankae/LibreVNA/releases). * If you would like to try out the newest features, the compiled versions of each commit can be found [here](https://github.com/jankae/LibreVNA/actions) (but keep in mind that some features might be unstable or incomplete). If you are having trouble downloading them, please refer to this [guide](Documentation/DeveloperInfo/DownloadActionBuilds.md). From 2d5609b1c5bac697732984be85d4d8f39b0c40cb Mon Sep 17 00:00:00 2001 From: M Gray Date: Sun, 2 Mar 2025 19:03:33 +0000 Subject: [PATCH 3/3] Updated release tagger to build and tag MacOS 13.7 builds. --- .github/workflows/Release_tag_stable.yml | 45 +++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release_tag_stable.yml b/.github/workflows/Release_tag_stable.yml index 1be9d70..0e5ef7e 100644 --- a/.github/workflows/Release_tag_stable.yml +++ b/.github/workflows/Release_tag_stable.yml @@ -209,7 +209,50 @@ jobs: with: upload_url: ${{ needs.PC_Application_Ubuntu.outputs.upload_url }} asset_path: ./Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip - asset_name: LibreVNA-GUI-OSX-${{env.LIBREVNA_VERSION}}.zip + asset_name: LibreVNA-GUI-OSX-latest-${{env.LIBREVNA_VERSION}}.zip + asset_content_type: application/tar+gzip + + PC_Application_OSX_13: + needs: PC_Application_Ubuntu + runs-on: macos-13 + steps: + - uses: actions/checkout@v4 + + - name: Install dependencies + run: | + brew install qt@6 pcre + + - name: Set Environment + run: | + echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH + + - name: Get app version + id: id_version + run: | + cd Software/PC_Application/LibreVNA-GUI + fw_major=`pcregrep -o '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` + fw_minor=`pcregrep -o '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro` + fw_patch=`pcregrep -o '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` + echo "app_version=v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT + + - name: Build application + run: | + cd Software/PC_Application/LibreVNA-GUI + qmake LibreVNA-GUI.pro + make -j9 + macdeployqt LibreVNA-GUI.app + zip -ry LibreVNA-GUI.zip LibreVNA-GUI.app + shell: bash + + - name: 'Upload release asset' + uses: actions/upload-release-asset@v1 + env: + LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ needs.PC_Application_Ubuntu.outputs.upload_url }} + asset_path: ./Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip + asset_name: LibreVNA-GUI-OSX-13.7-${{env.LIBREVNA_VERSION}}.zip asset_content_type: application/tar+gzip Embedded_Firmware: