diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 073919f42..9f4f85417 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -27,22 +27,25 @@ jobs: echo "version=$version" >> $GITHUB_OUTPUT - name: store dummy version and build number for pull request + id: pull_request_version_number if: github.event_name == 'pull_request' run: | echo "100" > latest-subsurface-buildnumber echo "CICD-pull-request" > latest-subsurface-buildnumber-extension + version=$(scripts/get-version) + echo "version=$version" >> $GITHUB_OUTPUT - name: setup Homebrew run: brew install hidapi libxslt libjpg libmtp create-dmg confuse - name: set our Qt build run: | - curl --output ssrf-Qt-5.15.2-mac.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/ssrf-Qt5.15.2.tar.xz - tar -xJf ssrf-Qt-5.15.2-mac.tar.xz + curl -O https://f002.backblazeb2.com/file/Subsurface-Travis/Qt5.15.13-mac.tar.xz + tar -xJf Qt*-mac.tar.xz - name: build Subsurface id: build run: | 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 PATH=$QT_ROOT/bin:$PATH export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake @@ -58,6 +61,14 @@ jobs: echo "Created $IMG" 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) - name: upload binaries if: github.event_name == 'push'