diff --git a/.github/workflows/android.yml.origin b/.github/workflows/android.yml similarity index 72% rename from .github/workflows/android.yml.origin rename to .github/workflows/android.yml index 08f1e43..de4608f 100644 --- a/.github/workflows/android.yml.origin +++ b/.github/workflows/android.yml @@ -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/install-qt-action@v2.10.0 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/install-qt-action@v2.10.0 + 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 diff --git a/.github/workflows/android-arm64_v8a-qt5_12_10.yml b/.github/workflows/backup/android-arm64_v8a-qt5_12_10.yml similarity index 100% rename from .github/workflows/android-arm64_v8a-qt5_12_10.yml rename to .github/workflows/backup/android-arm64_v8a-qt5_12_10.yml diff --git a/.github/workflows/android-armv7-qt5_12_10.yml b/.github/workflows/backup/android-armv7-qt5_12_10.yml similarity index 100% rename from .github/workflows/android-armv7-qt5_12_10.yml rename to .github/workflows/backup/android-armv7-qt5_12_10.yml diff --git a/.github/workflows/android-qt5_15_2.yml b/.github/workflows/backup/android-qt5_15_2.yml similarity index 100% rename from .github/workflows/android-qt5_15_2.yml rename to .github/workflows/backup/android-qt5_15_2.yml diff --git a/.github/workflows/android-x86-qt5_12_10.yml b/.github/workflows/backup/android-x86-qt5_12_10.yml similarity index 100% rename from .github/workflows/android-x86-qt5_12_10.yml rename to .github/workflows/backup/android-x86-qt5_12_10.yml diff --git a/.github/workflows/ios-macos10_15-qt5_12_10.yml b/.github/workflows/backup/ios-macos10_15-qt5_12_10.yml similarity index 100% rename from .github/workflows/ios-macos10_15-qt5_12_10.yml rename to .github/workflows/backup/ios-macos10_15-qt5_12_10.yml diff --git a/.github/workflows/ios-macos10_15-qt5_15_2.yml b/.github/workflows/backup/ios-macos10_15-qt5_15_2.yml similarity index 100% rename from .github/workflows/ios-macos10_15-qt5_15_2.yml rename to .github/workflows/backup/ios-macos10_15-qt5_15_2.yml diff --git a/.github/workflows/ios-macos11_0-qt5_12_10.yml b/.github/workflows/backup/ios-macos11_0-qt5_12_10.yml similarity index 100% rename from .github/workflows/ios-macos11_0-qt5_12_10.yml rename to .github/workflows/backup/ios-macos11_0-qt5_12_10.yml diff --git a/.github/workflows/ios-macos11_0-qt5_15_2.yml b/.github/workflows/backup/ios-macos11_0-qt5_15_2.yml similarity index 100% rename from .github/workflows/ios-macos11_0-qt5_15_2.yml rename to .github/workflows/backup/ios-macos11_0-qt5_15_2.yml diff --git a/.github/workflows/macos10_15-qt5_12_10.yml b/.github/workflows/backup/macos10_15-qt5_12_10.yml similarity index 100% rename from .github/workflows/macos10_15-qt5_12_10.yml rename to .github/workflows/backup/macos10_15-qt5_12_10.yml diff --git a/.github/workflows/macos10_15-qt5_15_2.yml b/.github/workflows/backup/macos10_15-qt5_15_2.yml similarity index 100% rename from .github/workflows/macos10_15-qt5_15_2.yml rename to .github/workflows/backup/macos10_15-qt5_15_2.yml diff --git a/.github/workflows/macos10_15-qt5_9_9.yml b/.github/workflows/backup/macos10_15-qt5_9_9.yml similarity index 100% rename from .github/workflows/macos10_15-qt5_9_9.yml rename to .github/workflows/backup/macos10_15-qt5_9_9.yml diff --git a/.github/workflows/macos11_0-qt5_12_10.yml b/.github/workflows/backup/macos11_0-qt5_12_10.yml similarity index 100% rename from .github/workflows/macos11_0-qt5_12_10.yml rename to .github/workflows/backup/macos11_0-qt5_12_10.yml diff --git a/.github/workflows/macos11_0-qt5_15_2.yml b/.github/workflows/backup/macos11_0-qt5_15_2.yml similarity index 100% rename from .github/workflows/macos11_0-qt5_15_2.yml rename to .github/workflows/backup/macos11_0-qt5_15_2.yml diff --git a/.github/workflows/macos11_0-qt5_9_9.yml b/.github/workflows/backup/macos11_0-qt5_9_9.yml similarity index 100% rename from .github/workflows/macos11_0-qt5_9_9.yml rename to .github/workflows/backup/macos11_0-qt5_9_9.yml diff --git a/.github/workflows/ubuntu18_04-qt5_12_10.yml b/.github/workflows/backup/ubuntu18_04-qt5_12_10.yml similarity index 100% rename from .github/workflows/ubuntu18_04-qt5_12_10.yml rename to .github/workflows/backup/ubuntu18_04-qt5_12_10.yml diff --git a/.github/workflows/ubuntu18_04-qt5_15_2.yml b/.github/workflows/backup/ubuntu18_04-qt5_15_2.yml similarity index 100% rename from .github/workflows/ubuntu18_04-qt5_15_2.yml rename to .github/workflows/backup/ubuntu18_04-qt5_15_2.yml diff --git a/.github/workflows/ubuntu18_04-qt5_9_9.yml b/.github/workflows/backup/ubuntu18_04-qt5_9_9.yml similarity index 100% rename from .github/workflows/ubuntu18_04-qt5_9_9.yml rename to .github/workflows/backup/ubuntu18_04-qt5_9_9.yml diff --git a/.github/workflows/ubuntu20_04-qt5_12_10.yml b/.github/workflows/backup/ubuntu20_04-qt5_12_10.yml similarity index 100% rename from .github/workflows/ubuntu20_04-qt5_12_10.yml rename to .github/workflows/backup/ubuntu20_04-qt5_12_10.yml diff --git a/.github/workflows/ubuntu20_04-qt5_15_2.yml b/.github/workflows/backup/ubuntu20_04-qt5_15_2.yml similarity index 100% rename from .github/workflows/ubuntu20_04-qt5_15_2.yml rename to .github/workflows/backup/ubuntu20_04-qt5_15_2.yml diff --git a/.github/workflows/ubuntu20_04-qt5_9_9.yml b/.github/workflows/backup/ubuntu20_04-qt5_9_9.yml similarity index 100% rename from .github/workflows/ubuntu20_04-qt5_9_9.yml rename to .github/workflows/backup/ubuntu20_04-qt5_9_9.yml diff --git a/.github/workflows/windows-qt5_12_10-win32_msvc2017.yml b/.github/workflows/backup/windows-qt5_12_10-win32_msvc2017.yml similarity index 100% rename from .github/workflows/windows-qt5_12_10-win32_msvc2017.yml rename to .github/workflows/backup/windows-qt5_12_10-win32_msvc2017.yml diff --git a/.github/workflows/windows-qt5_12_10-win64_msvc2017.yml b/.github/workflows/backup/windows-qt5_12_10-win64_msvc2017.yml similarity index 100% rename from .github/workflows/windows-qt5_12_10-win64_msvc2017.yml rename to .github/workflows/backup/windows-qt5_12_10-win64_msvc2017.yml diff --git a/.github/workflows/windows-qt5_15_2-win32_msvc2019.yml b/.github/workflows/backup/windows-qt5_15_2-win32_msvc2019.yml similarity index 100% rename from .github/workflows/windows-qt5_15_2-win32_msvc2019.yml rename to .github/workflows/backup/windows-qt5_15_2-win32_msvc2019.yml diff --git a/.github/workflows/windows-qt5_15_2-win64_msvc2019.yml b/.github/workflows/backup/windows-qt5_15_2-win64_msvc2019.yml similarity index 100% rename from .github/workflows/windows-qt5_15_2-win64_msvc2019.yml rename to .github/workflows/backup/windows-qt5_15_2-win64_msvc2019.yml diff --git a/.github/workflows/windows-qt5_9_9-win32_msvc2015.yml b/.github/workflows/backup/windows-qt5_9_9-win32_msvc2015.yml similarity index 100% rename from .github/workflows/windows-qt5_9_9-win32_msvc2015.yml rename to .github/workflows/backup/windows-qt5_9_9-win32_msvc2015.yml diff --git a/.github/workflows/windows-qt5_9_9-win64_msvc2017.yml b/.github/workflows/backup/windows-qt5_9_9-win64_msvc2017.yml similarity index 100% rename from .github/workflows/windows-qt5_9_9-win64_msvc2017.yml rename to .github/workflows/backup/windows-qt5_9_9-win64_msvc2017.yml diff --git a/.github/workflows/ios.yml.origin b/.github/workflows/ios.yml similarity index 78% rename from .github/workflows/ios.yml.origin rename to .github/workflows/ios.yml index c59e64f..a7185c8 100644 --- a/.github/workflows/ios.yml.origin +++ b/.github/workflows/ios.yml @@ -39,6 +39,14 @@ jobs: version: ${{ matrix.qt_ver }} # Target platform for build target: ${{ matrix.qt_target }} + - 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 diff --git a/.github/workflows/macos.yml.origin b/.github/workflows/macos.yml similarity index 67% rename from .github/workflows/macos.yml.origin rename to .github/workflows/macos.yml index 0b2ad20..61650b2 100644 --- a/.github/workflows/macos.yml.origin +++ b/.github/workflows/macos.yml @@ -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/install-qt-action@v2.10.0 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 diff --git a/.github/workflows/ubuntu.yml.origin b/.github/workflows/ubuntu.yml similarity index 63% rename from .github/workflows/ubuntu.yml.origin rename to .github/workflows/ubuntu.yml index beb288d..ffad555 100644 --- a/.github/workflows/ubuntu.yml.origin +++ b/.github/workflows/ubuntu.yml @@ -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/install-qt-action@v2.10.0 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 diff --git a/.github/workflows/windows.yml.origin b/.github/workflows/windows.yml similarity index 83% rename from .github/workflows/windows.yml.origin rename to .github/workflows/windows.yml index 1390dda..896be5d 100644 --- a/.github/workflows/windows.yml.origin +++ b/.github/workflows/windows.yml @@ -64,24 +64,8 @@ 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/install-qt-action@v2.10.0 with: @@ -89,13 +73,8 @@ jobs: 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 diff --git a/README-zh.md b/README-zh.md index f5a3f61..0af4e25 100644 --- a/README-zh.md +++ b/README-zh.md @@ -68,87 +68,25 @@ ## 编译 -|平台|架构|Qt版本|状态| -|--|--|--|--| -|Windows|x86|5.9.9|![windows-qt5_9_9-win32_msvc2015-badge]| -|Windows|x64|5.9.9|![windows-qt5_9_9-win64_msvc2017-badge]| -|Windows|x86|5.12.10|![windows-qt5_12_10-win32_msvc2017-badge]| -|Windows|x64|5.12.10|![windows-qt5_12_10-win64_msvc2017-badge]| -|Windows|x86|5.15.2|![windows-qt5_15_2-win32_msvc2019-badge]| -|Windows|x64|5.15.2|![windows-qt5_15_2-win64_msvc2019-badge]| -|ubuntu18_04|x64|5.9.9|![ubuntu18_04-qt5_9_9-badge]| -|ubuntu18_04|x64|5.12.10|![ubuntu18_04-qt5_12_10-badge]| -|ubuntu18_04|x64|5.15.2|![ubuntu18_04-qt5_15_2-badge]| -|ubuntu20_04|x64|5.9.9|![ubuntu20_04-qt5_9_9-badge]| -|ubuntu20_04|x64|5.12.10|![ubuntu20_04-qt5_12_10-badge]| -|ubuntu20_04|x64|5.15.2|![ubuntu20_04-qt5_15_2-badge]| -|macos10_15|x64|5.9.9|![macos10_15-qt5_9_9-badge]| -|macos10_15|x64|5.12.10|![macos10_15-qt5_12_10-badge]| -|macos10_15|x64|5.15.2|![macos10_15-qt5_15_2-badge]| -|macos11_0|x64|5.9.9|![macos11_0-qt5_9_9-badge]| -|macos11_0|x64|5.12.10|![macos11_0-qt5_12_10-badge]| -|macos11_0|x64|5.15.2|![macos11_0-qt5_15_2-badge]| -|ios-macos10_15|x64|5.12.10|![ios-macos10_15-qt5_12_10-badge]| -|ios-macos10_15|x64|5.15.2|![ios-macos10_15-qt5_15_2-badge]| -|ios-macos11_0|x64|5.12.10|![ios-macos11_0-qt5_12_10-badge]| -|ios-macos11_0|x64|5.15.2|![ios-macos11_0-qt5_15_2-badge]| -|android-x86|x86|5.12.10|![android-x86-qt5_12_10-badge]| -|android-armv7|armv7|5.12.10|![android-armv7-qt5_12_10-badge]| -|android-arm64_v8a|arm64_v8a|5.12.10|![android-arm64_v8a-qt5_12_10-badge]| -|android|android|5.15.2|![android-qt5_15_2-badge]| +| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|[Android][android-link]|[IOS][ios-link]| +|---------------|---------------|-----------------|-----------------|----------------| +| ![win-badge] | ![ubuntu-badge] | ![macos-badge] |![android-badge] |![ios-badge] | -[windows-qt5_9_9-win32_msvc2015-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_9_9-win32_msvc2015/badge.svg "windows-qt5_9_9-win32_msvc2015" -[windows-qt5_9_9-win64_msvc2017-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_9_9-win64_msvc2017/badge.svg "windows-qt5_9_9-win64_msvc2017" +[win-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AWindows "WindowsAction" +[win-badge]: https://github.com/JaredTao/TaoQuick/workflows/Windows/badge.svg "Windows" -[windows-qt5_12_10-win32_msvc2017-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_12_10-win32_msvc2017/badge.svg "windows-qt5_12_10-win32_msvc2017" +[ubuntu-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AUbuntu "UbuntuAction" +[ubuntu-badge]: https://github.com/JaredTao/TaoQuick/workflows/Ubuntu/badge.svg "Ubuntu" -[windows-qt5_12_10-win64_msvc2017-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_12_10-win64_msvc2017/badge.svg "windows-qt5_12_10-win64_msvc2017" +[macos-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AMacOS "MacOSAction" +[macos-badge]: https://github.com/JaredTao/TaoQuick/workflows/MacOS/badge.svg "MacOS" -[windows-qt5_15_2-win32_msvc2019-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_15_2-win32_msvc2019/badge.svg "windows-qt5_15_2-win32_msvc2019" - -[windows-qt5_15_2-win64_msvc2019-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_15_2-win64_msvc2019/badge.svg "windows-qt5_15_2-win64_msvc2019" - -[ubuntu18_04-qt5_9_9-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu18_04-qt5_9_9/badge.svg "ubuntu18_04-qt5_9_9" - -[ubuntu18_04-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu18_04-qt5_12_10/badge.svg "ubuntu18_04-qt5_12_10" - -[ubuntu18_04-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu18_04-qt5_15_2/badge.svg "ubuntu18_04-qt5_15_2" - -[ubuntu20_04-qt5_9_9-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu20_04-qt5_9_9/badge.svg "ubuntu20_04-qt5_9_9" - -[ubuntu20_04-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu20_04-qt5_12_10/badge.svg "ubuntu20_04-qt5_12_10" - -[ubuntu20_04-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu20_04-qt5_15_2/badge.svg "ubuntu20_04-qt5_15_2" - -[macos10_15-qt5_9_9-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos10_15-qt5_9_9/badge.svg "macos10_15-qt5_9_9" - -[macos10_15-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos10_15-qt5_12_10/badge.svg "macos10_15-qt5_12_10" - -[macos10_15-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos10_15-qt5_15_2/badge.svg "macos10_15-qt5_15_2" - -[macos11_0-qt5_9_9-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos11_0-qt5_9_9/badge.svg "macos11_0-qt5_9_9" - -[macos11_0-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos11_0-qt5_12_10/badge.svg "macos11_0-qt5_12_10" - -[macos11_0-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos11_0-qt5_15_2/badge.svg "macos11_0-qt5_15_2" - -[ios-macos10_15-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/ios-macos10_15-qt5_12_10/badge.svg "ios-macos10_15-qt5_12_10" - -[ios-macos10_15-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/ios-macos10_15-qt5_15_2/badge.svg "ios-macos10_15-qt5_15_2" - -[ios-macos11_0-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/ios-macos11_0-qt5_12_10/badge.svg "ios-macos11_0-qt5_12_10" - -[ios-macos11_0-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/ios-macos11_0-qt5_15_2/badge.svg "ios-macos11_0-qt5_15_2" - -[android-x86-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/android-x86-qt5_12_10/badge.svg "android-x86-qt5_12_10" - -[android-armv7-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/android-armv7-qt5_12_10/badge.svg "android-armv7-qt5_12_10" - -[android-arm64_v8a-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/android-arm64_v8a-qt5_12_10/badge.svg "android-arm64_v8a-qt5_12_10" - -[android-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/android-qt5_15_2/badge.svg "android-qt5_15_2" +[android-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AAndroid "AndroidAction" +[android-badge]: https://github.com/JaredTao/TaoQuick/workflows/Android/badge.svg "Android" +[ios-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AIOS "IOSAction" +[ios-badge]: https://github.com/JaredTao/TaoQuick/workflows/IOS/badge.svg "IOS" ## 发布 diff --git a/README.md b/README.md index b6ba79b..8591a1c 100644 --- a/README.md +++ b/README.md @@ -52,86 +52,25 @@ make the appropriate function expansion to facilitate development of Qml applic ## Build -|platform|arch|Qt version|status| -|--|--|--|--| -|Windows|x86|5.9.9|![windows-qt5_9_9-win32_msvc2015-badge]| -|Windows|x64|5.9.9|![windows-qt5_9_9-win64_msvc2017-badge]| -|Windows|x86|5.12.10|![windows-qt5_12_10-win32_msvc2017-badge]| -|Windows|x64|5.12.10|![windows-qt5_12_10-win64_msvc2017-badge]| -|Windows|x86|5.15.2|![windows-qt5_15_2-win32_msvc2019-badge]| -|Windows|x64|5.15.2|![windows-qt5_15_2-win64_msvc2019-badge]| -|ubuntu18_04|x64|5.9.9|![ubuntu18_04-qt5_9_9-badge]| -|ubuntu18_04|x64|5.12.10|![ubuntu18_04-qt5_12_10-badge]| -|ubuntu18_04|x64|5.15.2|![ubuntu18_04-qt5_15_2-badge]| -|ubuntu20_04|x64|5.9.9|![ubuntu20_04-qt5_9_9-badge]| -|ubuntu20_04|x64|5.12.10|![ubuntu20_04-qt5_12_10-badge]| -|ubuntu20_04|x64|5.15.2|![ubuntu20_04-qt5_15_2-badge]| -|macos10_15|x64|5.9.9|![macos10_15-qt5_9_9-badge]| -|macos10_15|x64|5.12.10|![macos10_15-qt5_12_10-badge]| -|macos10_15|x64|5.15.2|![macos10_15-qt5_15_2-badge]| -|macos11_0|x64|5.9.9|![macos11_0-qt5_9_9-badge]| -|macos11_0|x64|5.12.10|![macos11_0-qt5_12_10-badge]| -|macos11_0|x64|5.15.2|![macos11_0-qt5_15_2-badge]| -|ios-macos10_15|x64|5.12.10|![ios-macos10_15-qt5_12_10-badge]| -|ios-macos10_15|x64|5.15.2|![ios-macos10_15-qt5_15_2-badge]| -|ios-macos11_0|x64|5.12.10|![ios-macos11_0-qt5_12_10-badge]| -|ios-macos11_0|x64|5.15.2|![ios-macos11_0-qt5_15_2-badge]| -|android-x86|x86|5.12.10|![android-x86-qt5_12_10-badge]| -|android-armv7|armv7|5.12.10|![android-armv7-qt5_12_10-badge]| -|android-arm64_v8a|arm64_v8a|5.12.10|![android-arm64_v8a-qt5_12_10-badge]| -|android|android|5.15.2|![android-qt5_15_2-badge]| +| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|[Android][android-link]|[IOS][ios-link]| +|---------------|---------------|-----------------|-----------------|----------------| +| ![win-badge] | ![ubuntu-badge] | ![macos-badge] |![android-badge] |![ios-badge] | -[windows-qt5_9_9-win32_msvc2015-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_9_9-win32_msvc2015/badge.svg "windows-qt5_9_9-win32_msvc2015" -[windows-qt5_9_9-win64_msvc2017-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_9_9-win64_msvc2017/badge.svg "windows-qt5_9_9-win64_msvc2017" +[win-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AWindows "WindowsAction" +[win-badge]: https://github.com/JaredTao/TaoQuick/workflows/Windows/badge.svg "Windows" -[windows-qt5_12_10-win32_msvc2017-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_12_10-win32_msvc2017/badge.svg "windows-qt5_12_10-win32_msvc2017" +[ubuntu-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AUbuntu "UbuntuAction" +[ubuntu-badge]: https://github.com/JaredTao/TaoQuick/workflows/Ubuntu/badge.svg "Ubuntu" -[windows-qt5_12_10-win64_msvc2017-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_12_10-win64_msvc2017/badge.svg "windows-qt5_12_10-win64_msvc2017" +[macos-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AMacOS "MacOSAction" +[macos-badge]: https://github.com/JaredTao/TaoQuick/workflows/MacOS/badge.svg "MacOS" -[windows-qt5_15_2-win32_msvc2019-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_15_2-win32_msvc2019/badge.svg "windows-qt5_15_2-win32_msvc2019" +[android-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AAndroid "AndroidAction" +[android-badge]: https://github.com/JaredTao/TaoQuick/workflows/Android/badge.svg "Android" -[windows-qt5_15_2-win64_msvc2019-badge]: https://github.com/JaredTao/TaoQuick/workflows/windows-qt5_15_2-win64_msvc2019/badge.svg "windows-qt5_15_2-win64_msvc2019" - -[ubuntu18_04-qt5_9_9-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu18_04-qt5_9_9/badge.svg "ubuntu18_04-qt5_9_9" - -[ubuntu18_04-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu18_04-qt5_12_10/badge.svg "ubuntu18_04-qt5_12_10" - -[ubuntu18_04-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu18_04-qt5_15_2/badge.svg "ubuntu18_04-qt5_15_2" - -[ubuntu20_04-qt5_9_9-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu20_04-qt5_9_9/badge.svg "ubuntu20_04-qt5_9_9" - -[ubuntu20_04-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu20_04-qt5_12_10/badge.svg "ubuntu20_04-qt5_12_10" - -[ubuntu20_04-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/ubuntu20_04-qt5_15_2/badge.svg "ubuntu20_04-qt5_15_2" - -[macos10_15-qt5_9_9-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos10_15-qt5_9_9/badge.svg "macos10_15-qt5_9_9" - -[macos10_15-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos10_15-qt5_12_10/badge.svg "macos10_15-qt5_12_10" - -[macos10_15-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos10_15-qt5_15_2/badge.svg "macos10_15-qt5_15_2" - -[macos11_0-qt5_9_9-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos11_0-qt5_9_9/badge.svg "macos11_0-qt5_9_9" - -[macos11_0-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos11_0-qt5_12_10/badge.svg "macos11_0-qt5_12_10" - -[macos11_0-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/macos11_0-qt5_15_2/badge.svg "macos11_0-qt5_15_2" - -[ios-macos10_15-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/ios-macos10_15-qt5_12_10/badge.svg "ios-macos10_15-qt5_12_10" - -[ios-macos10_15-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/ios-macos10_15-qt5_15_2/badge.svg "ios-macos10_15-qt5_15_2" - -[ios-macos11_0-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/ios-macos11_0-qt5_12_10/badge.svg "ios-macos11_0-qt5_12_10" - -[ios-macos11_0-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/ios-macos11_0-qt5_15_2/badge.svg "ios-macos11_0-qt5_15_2" - -[android-x86-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/android-x86-qt5_12_10/badge.svg "android-x86-qt5_12_10" - -[android-armv7-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/android-armv7-qt5_12_10/badge.svg "android-armv7-qt5_12_10" - -[android-arm64_v8a-qt5_12_10-badge]: https://github.com/JaredTao/TaoQuick/workflows/android-arm64_v8a-qt5_12_10/badge.svg "android-arm64_v8a-qt5_12_10" - -[android-qt5_15_2-badge]: https://github.com/JaredTao/TaoQuick/workflows/android-qt5_15_2/badge.svg "android-qt5_15_2" +[ios-link]: https://github.com/JaredTao/TaoQuick/actions?query=workflow%3AIOS "IOSAction" +[ios-badge]: https://github.com/JaredTao/TaoQuick/workflows/IOS/badge.svg "IOS" ## Release