|
1 | 1 | name: MacOS
|
2 |
| -on: |
| 2 | +on: |
3 | 3 | push:
|
4 | 4 | paths-ignore:
|
5 | 5 | - 'README.md'
|
@@ -30,36 +30,41 @@ jobs:
|
30 | 30 | with:
|
31 | 31 | path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
|
32 | 32 | key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
|
33 |
| - - name: setupQt |
34 |
| - if: steps.MacosCacheQt.outputs.cache-hit == 'true' |
35 |
| - shell: pwsh |
36 |
| - env: |
37 |
| - QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} |
38 |
| - run: | |
39 |
| - $qt_Path=${env:QtPath} |
40 |
| - echo "::set-env name=Qt5_Dir::$qt_Path" |
41 |
| - echo "::add-path::$qt_Path/bin" |
| 33 | +# - name: setupQt |
| 34 | +# if: steps.MacosCacheQt.outputs.cache-hit == 'true' |
| 35 | +# shell: bash |
| 36 | +# env: |
| 37 | +# QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} |
| 38 | +# run: | |
| 39 | +# qt_Path=${env:QtPath} |
| 40 | +# echo "Qt5_DIR=\"$QtPath\"" >> $GITHUB_ENV |
| 41 | +# echo "${qt_Path}/bin" >> $GITHUB_PATH |
42 | 42 | - name: Install Qt
|
43 | 43 | if: steps.MacosCacheQt.outputs.cache-hit != 'true'
|
44 | 44 | uses: jurplel/install-qt-action@v2
|
45 | 45 | with:
|
46 | 46 | version: ${{ matrix.qt_ver }}
|
47 |
| - |
| 47 | + |
48 | 48 | - uses: actions/checkout@v2
|
49 | 49 | with:
|
50 | 50 | submodules: true
|
51 |
| - - name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages |
| 51 | + - name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages |
52 | 52 | run: |
|
53 | 53 | brew install ninja pkg-config
|
54 | 54 | - name: build macos
|
| 55 | + env: |
| 56 | + Qt5_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} |
55 | 57 | run: |
|
56 | 58 | cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DLEMON_BUILD_INFO="Build for macOS" -DLEMON_BUILD_EXTRA_INFO="Build on $(uname -sr)" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13
|
57 | 59 | cmake --build . --parallel $(sysctl -n hw.logicalcpu)
|
58 | 60 | # tag 打包
|
59 | 61 | - name: package
|
| 62 | + env: |
| 63 | + Qt5_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} |
60 | 64 | run: |
|
61 | 65 | # 拷贝依赖
|
62 | 66 | #mv ${targetName} ${targetName}.app
|
| 67 | + export PATH=$Qt5_DIR/bin:$PATH |
63 | 68 | macdeployqt ${targetName}.app -qmldir=. -verbose=1 -dmg
|
64 | 69 | - name: Upload artifact
|
65 | 70 | uses: actions/upload-artifact@v2-preview
|
|
0 commit comments