-
Notifications
You must be signed in to change notification settings - Fork 370
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
33 changed files
with
59 additions
and
215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,18 +28,15 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| os: [ubuntu-20.04] | ||
| # 5.9.8 版本低，需要额外设置工具链。这里暂不支持。 | ||
| qt_ver: [5.12.10] | ||
| qt_target: [android] | ||
| qt_arch: [android_x86,android_armv7,android_arm64_v8a] | ||
| # android_arm64_v8a 暂时不支持. install-qt-action 依赖的aqtinstall版本为0.5*,需要升级 | ||
| # qt_arch: [android_x86,android_armv7] | ||
| # exclude: | ||
| # - qt_ver: 5.9.8 | ||
| # qt_arch: android_arm64_v8a | ||
| include: | ||
| qt_ver: 5.15.2 | ||
| qt_arch: '' | ||
| steps: | ||
| - name: Install Qt | ||
| # if: steps.cacheqt.outputs.cache-hit != 'true' | ||
| - name: Install Qt 5.12.10 | ||
| if: ${{ matrix.qt_ver }} != '5.15.2' | ||
| uses: jurplel/[email protected] | ||
| with: | ||
| # Version of Qt to install | ||
|
|
@@ -48,6 +45,16 @@ jobs: | |
| target: ${{ matrix.qt_target }} | ||
| # Architecture for Windows/Android | ||
| arch: ${{ matrix.qt_arch }} | ||
| - name: Install Qt 5.15.2 | ||
| if: ${{ matrix.qt_ver }} == '5.15.2' | ||
| uses: jurplel/[email protected] | ||
| with: | ||
| # Version of Qt to install | ||
| version: ${{ matrix.qt_ver }} | ||
| # Target platform for build | ||
| target: ${{ matrix.qt_target }} | ||
| # Architecture for Windows/Android | ||
| # arch: ${{ matrix.qt_arch }} | ||
| - uses: actions/checkout@v1 | ||
| with: | ||
| fetch-depth: 1 | ||
|
|
||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,30 +32,20 @@ jobs: | |
| qt_arch: [clang_64] | ||
| env: | ||
| targetName: TaoQuickShow | ||
| steps: | ||
| # - name: cacheQt | ||
| # id: MacosCacheQt | ||
| # uses: actions/cache@v1 | ||
| # with: | ||
| # path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} | ||
| # key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} | ||
| # - name: setupQt | ||
| # if: steps.MacosCacheQt.outputs.cache-hit == 'true' | ||
| # shell: pwsh | ||
| # env: | ||
| # QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} | ||
| # run: | | ||
| # $qt_Path=${env:QtPath} | ||
| # echo "::set-env name=Qt5_Dir::$qt_Path" | ||
| # echo "::add-path::$qt_Path/bin" | ||
| steps: | ||
| - name: Install Qt | ||
| # if: steps.MacosCacheQt.outputs.cache-hit != 'true' | ||
| uses: jurplel/[email protected] | ||
| with: | ||
| version: ${{ matrix.qt_ver }} | ||
| # cached: ${{ steps.MacosCacheQt.outputs.cache-hit }} | ||
| cached: 'false' | ||
|
|
||
| - name: prepare env | ||
| if: ${{ matrix.os }} == 'macos-11.0' | ||
| run: | | ||
| softwareupdate --all --install --force | ||
| sudo rm -rf /Library/Developer/CommandLineTools | ||
| pip install multidict | ||
| sudo xcode-select --install | ||
| sudo xcode-select --switch /Library/Developer/CommandLineTools | ||
| - uses: actions/checkout@v1 | ||
| with: | ||
| fetch-depth: 1 | ||
|
|
@@ -77,6 +67,6 @@ jobs: | |
| with: | ||
| repo_token: ${{ secrets.GITHUB_TOKEN }} | ||
| file: bin/release/${{ env.targetName }}.dmg | ||
| asset_name: ${{ runner.os }}-${{ env.targetName }}.dmg | ||
| asset_name: ${{ env.targetName }}-${{ matrix.os }}-${{ matrix.qt_ver }}.dmg | ||
| tag: ${{ github.ref }} | ||
| overwrite: true | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,27 +33,10 @@ jobs: | |
| qt_ver: [5.9.9,5.12.10,5.15.2] | ||
| qt_arch: [gcc_64] | ||
| steps: | ||
| # - name: cacheQt | ||
| # id: UbuntuCacheQt | ||
| # uses: actions/cache@v1 | ||
| # with: | ||
| # path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} | ||
| # key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} | ||
| # - name: setupQt | ||
| # if: steps.UbuntuCacheQt.outputs.cache-hit == 'true' | ||
| # shell: pwsh | ||
| # env: | ||
| # QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} | ||
| # run: | | ||
| # $qt_Path=${env:QtPath} | ||
| # echo "::set-env name=Qt5_Dir::$qt_Path" | ||
| # echo "::add-path::$qt_Path/bin" | ||
| - name: Install Qt | ||
| # if: steps.UbuntuCacheQt.outputs.cache-hit != 'true' | ||
| uses: jurplel/[email protected] | ||
| with: | ||
| version: ${{ matrix.qt_ver }} | ||
| # cached: ${{ steps.UbuntuCacheQt.outputs.cache-hit }} | ||
| cached: 'false' | ||
| - name: ubuntu install GL library | ||
| run: sudo apt-get install -y libglew-dev libglfw3-dev | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,38 +64,17 @@ jobs: | |
| targetName: TaoQuickShow.exe | ||
| # 步骤 | ||
| steps: | ||
| # - name: cacheQt | ||
| # id: WindowsCacheQt | ||
| # uses: actions/cache@v1 | ||
| # with: | ||
| # path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch_install}} | ||
| # key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} | ||
| # - name: setupQt | ||
| # if: steps.WindowsCacheQt.outputs.cache-hit == 'true' | ||
| # shell: pwsh | ||
| # env: | ||
| # QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch_install}} | ||
| # run: | | ||
| # $qt_Path=${env:QtPath} | ||
| # echo "::set-env name=Qt5_Dir::$qt_Path" | ||
| # echo "::add-path::$qt_Path/bin" | ||
| # 安装Qt | ||
| - name: Install Qt | ||
| # if: steps.WindowsCacheQt.outputs.cache-hit != 'true' | ||
| # 使用外部action。这个action专门用来安装Qt | ||
| uses: jurplel/[email protected] | ||
| with: | ||
| # Version of Qt to install | ||
| version: ${{ matrix.qt_ver }} | ||
| # Target platform for build | ||
| # target: ${{ matrix.qt_target }} | ||
| # Architecture for Windows/Android | ||
| arch: ${{ matrix.qt_arch }} | ||
| aqtversion: '==0.10.0' | ||
| # dir: 'C:/QtPath' | ||
| # dir: ${{ github.workspace }} | ||
| # dir: '${{ github.workspace }}' | ||
| # cached: ${{ steps.WindowsCacheQt.outputs.cache-hit }} | ||
| cached: 'false' | ||
| # 拉取代码 | ||
| - uses: actions/checkout@v1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters