jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 09:33:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

change qt install dir in the action

Browse source
This commit is contained in:
Bruno Alexandre Rosa 2025-11-06 18:26:51 -03:00
parent a252f5623a
commit 910d3aee66
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/desktop-build.yml vendored
View file

@ -303,14 +303,11 @@ jobs:
ccache-key-prefix: ccache-${{matrix.os}}-${{matrix.soc}}-${{matrix.type}} ccache-key-prefix: ccache-${{matrix.os}}-${{matrix.soc}}-${{matrix.type}}
gh-token: ${{ secrets.GITHUB_TOKEN }} gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Add RUNNER_WORKSPACE to GitHub environment variables
run: echo "RUNNER_WORKSPACE=$RUNNER_WORKSPACE" >> $GITHUB_ENV
- name: Restore thin Qt libraries - name: Restore thin Qt libraries
id: restore_qt id: restore_qt
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
with: with:
path: ${{ env.RUNNER_WORKSPACE }}/Qt path: ${{ github.workspace }}/Qt
key: qt-macos-${{ matrix.soc }}-${{ env.QT_VERSION }} key: qt-macos-${{ matrix.soc }}-${{ env.QT_VERSION }}
# Using jurplel/install-qt-action to install Qt without using brew # Using jurplel/install-qt-action to install Qt without using brew
@ -323,6 +320,7 @@ jobs:
version: ${{env.QT_VERSION}} version: ${{env.QT_VERSION}}
arch: ${{env.QT_ARCH}} arch: ${{env.QT_ARCH}}
modules: ${{env.QT_MODULES}} modules: ${{env.QT_MODULES}}
dir: Qt
- name: Thin Qt libraries - name: Thin Qt libraries
if: steps.restore_qt.outputs.cache-hit != 'true' if: steps.restore_qt.outputs.cache-hit != 'true'
@ -330,7 +328,7 @@ jobs:
export ARCH=$(uname -m) export ARCH=$(uname -m)
export NPROC=$(sysctl -n hw.ncpu) export NPROC=$(sysctl -n hw.ncpu)
echo "::group::Thinning Qt libraries to $ARCH using $NPROC cores" echo "::group::Thinning Qt libraries to $ARCH using $NPROC cores"
find $RUNNER_WORKSPACE/Qt -type f -print0 | \ find ${{ github.workspace }}/Qt -type f -print0 | \
xargs -0 -n1 -P "$NPROC" sh -c \ xargs -0 -n1 -P "$NPROC" sh -c \
'file -b --mime-type "$0" | grep -q "application/x-mach-binary" && echo "Processing $0" && lipo "$0" -thin "$ARCH" -output "$0" || true' 'file -b --mime-type "$0" | grep -q "application/x-mach-binary" && echo "Processing $0" && lipo "$0" -thin "$ARCH" -output "$0" || true'
echo "::endgroup::" echo "::endgroup::"
@ -339,7 +337,7 @@ jobs:
if: steps.restore_qt.outputs.cache-hit != 'true' if: steps.restore_qt.outputs.cache-hit != 'true'
uses: actions/cache/save@v4 uses: actions/cache/save@v4
with: with:
path: ${{ env.RUNNER_WORKSPACE }}/Qt path: ${{ github.workspace }}/Qt
key: qt-macos-${{ matrix.soc }}-${{ env.QT_VERSION }} key: qt-macos-${{ matrix.soc }}-${{ env.QT_VERSION }}
- name: Setup vcpkg cache - name: Setup vcpkg cache
@ -363,7 +361,7 @@ jobs:
VCPKG_DISABLE_METRICS: 1 VCPKG_DISABLE_METRICS: 1
VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
TARGET_MACOS_VERSION: ${{ matrix.override_target }} TARGET_MACOS_VERSION: ${{ matrix.override_target }}
QTDIR: ${{ env.RUNNER_WORKSPACE }}/Qt/${{ env.QT_VERSION }}/macos QTDIR: ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos
run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" --vcpkg run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" --vcpkg
- name: Sign app bundle - name: Sign app bundle