mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

CICD: Update Qt Version Used in the MacOS Build to 5.15.13.

Browse source 
Update the version of Qt that is used in the CICD build for MacOS to
5.15.13. This version is showing promise for building binaries that work
on Apple silicon.

Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
=Michael Keller 2024-05-06 10:59:25 +12:00 • committed by Michael Keller
parent 46cf2fc086
commit 133354d51d
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.github/workflows/mac.yml vendored
View file

@ -27,22 +27,25 @@ jobs:
echo "version=$version" >> $GITHUB_OUTPUT echo "version=$version" >> $GITHUB_OUTPUT
- name: store dummy version and build number for pull request - name: store dummy version and build number for pull request
id: pull_request_version_number
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'
run: | run: |
echo "100" > latest-subsurface-buildnumber echo "100" > latest-subsurface-buildnumber
echo "CICD-pull-request" > latest-subsurface-buildnumber-extension echo "CICD-pull-request" > latest-subsurface-buildnumber-extension
version=$(scripts/get-version)
echo "version=$version" >> $GITHUB_OUTPUT
- name: setup Homebrew - name: setup Homebrew
run: brew install hidapi libxslt libjpg libmtp create-dmg confuse run: brew install hidapi libxslt libjpg libmtp create-dmg confuse
- name: set our Qt build - name: set our Qt build
run: | run: |
curl --output ssrf-Qt-5.15.2-mac.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/ssrf-Qt5.15.2.tar.xz curl -O https://f002.backblazeb2.com/file/Subsurface-Travis/Qt5.15.13-mac.tar.xz
tar -xJf ssrf-Qt-5.15.2-mac.tar.xz tar -xJf Qt*-mac.tar.xz
- name: build Subsurface - name: build Subsurface
id: build id: build
run: | run: |
cd ${GITHUB_WORKSPACE}/.. cd ${GITHUB_WORKSPACE}/..
export QT_ROOT=${GITHUB_WORKSPACE}/Qt5.15.2/5.15.2/clang_64 export QT_ROOT=${GITHUB_WORKSPACE}/Qt5.15.13
export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
export PATH=$QT_ROOT/bin:$PATH export PATH=$QT_ROOT/bin:$PATH
export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
@ -58,6 +61,14 @@ jobs:
echo "Created $IMG" echo "Created $IMG"
echo "dmg=$IMG" >> $GITHUB_OUTPUT echo "dmg=$IMG" >> $GITHUB_OUTPUT
- name: publish pull request artifacts
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
with:
name: Subsurface-MacOS-${{ steps.pull_request_version_number.outputs.version }}
path: ${{ steps.build.outputs.dmg }}
compression-level: 0
# only publish a 'release' on push events (those include merging a PR) # only publish a 'release' on push events (those include merging a PR)
- name: upload binaries - name: upload binaries
if: github.event_name == 'push' if: github.event_name == 'push'