Skip to content

Commit 68af535

Browse files
alphagoccCoelacanthusHex
authored andcommitted
fix(ci): macos
1 parent 06713dc commit 68af535

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

.github/workflows/macos-qt6.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,11 @@ jobs:
2525
env:
2626
targetName: lemon
2727
steps:
28-
- name: cacheQt
29-
id: MacosCacheQt
30-
uses: actions/cache@v1
31-
with:
32-
path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
33-
key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
34-
# - name: setupQt
35-
# if: steps.MacosCacheQt.outputs.cache-hit == 'true'
36-
# shell: bash
37-
# env:
38-
# QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
39-
# run: |
40-
# qt_Path=${env:QtPath}
41-
# echo "Qt5_DIR=\"$QtPath\"" >> $GITHUB_ENV
42-
# echo "${qt_Path}/bin" >> $GITHUB_PATH
4328
- name: Install Qt
44-
if: steps.MacosCacheQt.outputs.cache-hit != 'true'
4529
uses: jurplel/install-qt-action@v2
4630
with:
4731
version: ${{ matrix.qt_ver }}
32+
cached: ${{ steps.MacosCacheQt.outputs.cache-hit }}
4833

4934
- uses: actions/checkout@v2
5035
with:
@@ -53,16 +38,14 @@ jobs:
5338
run: |
5439
brew install ninja pkg-config
5540
- name: build macos
56-
env:
57-
Qt6_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
5841
run: |
5942
cmake . \
6043
-GNinja \
6144
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
6245
-DLEMON_QT6=ON \
6346
-DLEMON_BUILD_INFO="Build for macOS" \
6447
-DLEMON_BUILD_EXTRA_INFO="Build on $(uname -sr)" \
65-
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13
48+
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
6649
cmake --build . --parallel $(sysctl -n hw.logicalcpu)
6750
# tag 打包
6851
- name: package

makespec/BUILDVERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
117
1+
118

0 commit comments

Comments
 (0)