From 08d7608f24e300de6288413034ede6782ba74b3f Mon Sep 17 00:00:00 2001 From: jared Date: Mon, 1 Mar 2021 09:45:19 +0800 Subject: [PATCH] update github actions --- .github/workflows/android-qt5_15_2.yml | 4 ++-- .github/workflows/android.yml | 4 ++-- .../workflows/{ios-macos-11_0.yml- => ios-macos-11_0.yml} | 5 +++-- .github/workflows/ios.yml | 4 ++-- .github/workflows/macos-11_0.yml | 4 ++-- .github/workflows/macos.yml | 8 ++++---- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows.yml | 5 ++--- examples/TaoQuickShow/TaoQuickShow.pro | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) rename .github/workflows/{ios-macos-11_0.yml- => ios-macos-11_0.yml} (92%) diff --git a/.github/workflows/android-qt5_15_2.yml b/.github/workflows/android-qt5_15_2.yml index 9558159..14560b4 100644 --- a/.github/workflows/android-qt5_15_2.yml +++ b/.github/workflows/android-qt5_15_2.yml @@ -32,7 +32,7 @@ jobs: steps: - name: Install Qt - uses: jurplel/install-qt-action@v2.10.0 + uses: jurplel/install-qt-action@v2.13.0 with: # Version of Qt to install version: ${{ matrix.qt_ver }} @@ -40,7 +40,7 @@ jobs: target: android # Architecture for Windows/Android # arch: ${{ matrix.qt_arch }} - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 submodules: 'true' diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9807395..65bccb2 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,7 +32,7 @@ jobs: qt_arch: [android_x86,android_armv7,android_arm64_v8a] steps: - name: Install Qt - uses: jurplel/install-qt-action@v2.10.0 + uses: jurplel/install-qt-action@v2.13.0 with: # Version of Qt to install version: ${{ matrix.qt_ver }} @@ -40,7 +40,7 @@ jobs: target: ${{ matrix.qt_target }} # Architecture for Windows/Android arch: ${{ matrix.qt_arch }} - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 submodules: 'true' diff --git a/.github/workflows/ios-macos-11_0.yml- b/.github/workflows/ios-macos-11_0.yml similarity index 92% rename from .github/workflows/ios-macos-11_0.yml- rename to .github/workflows/ios-macos-11_0.yml index 4065fa6..7920ca1 100644 --- a/.github/workflows/ios-macos-11_0.yml- +++ b/.github/workflows/ios-macos-11_0.yml @@ -37,16 +37,17 @@ jobs: - name: Install Qt # if: steps.cacheqt.outputs.cache-hit != 'true' - uses: jurplel/install-qt-action@v2.10.0 + uses: jurplel/install-qt-action@v2.13.0 with: # Version of Qt to install version: ${{ matrix.qt_ver }} # Target platform for build target: ${{ matrix.qt_target }} - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 + submodules: 'true' - name: build ios run: | qmake -r -spec macx-ios-clang CONFIG+=release CONFIG+=iphoneos diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index fdc3ca1..e1c07ec 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -32,14 +32,14 @@ jobs: steps: - name: Install Qt # if: steps.cacheqt.outputs.cache-hit != 'true' - uses: jurplel/install-qt-action@v2.10.0 + uses: jurplel/install-qt-action@v2.13.0 with: # Version of Qt to install version: ${{ matrix.qt_ver }} # Target platform for build target: ${{ matrix.qt_target }} - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 submodules: 'true' diff --git a/.github/workflows/macos-11_0.yml b/.github/workflows/macos-11_0.yml index 3a37164..1194de0 100644 --- a/.github/workflows/macos-11_0.yml +++ b/.github/workflows/macos-11_0.yml @@ -37,11 +37,11 @@ jobs: softwareupdate --all --install --force sudo xcode-select --switch /Library/Developer/CommandLineTools - name: Install Qt - uses: jurplel/install-qt-action@v2.10.0 + uses: jurplel/install-qt-action@v2.13.0 with: version: ${{ matrix.qt_ver }} cached: 'false' - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 submodules: 'true' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a631cbf..df280db 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -33,11 +33,11 @@ jobs: targetName: TaoQuickShow steps: - name: Install Qt - uses: jurplel/install-qt-action@v2.10.0 + uses: jurplel/install-qt-action@v2.13.0 with: version: ${{ matrix.qt_ver }} cached: 'false' - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 submodules: 'true' @@ -53,8 +53,8 @@ jobs: # 上传artifacts - uses: actions/upload-artifact@v2 with: - name: ${targetName}_${{matrix.qt_ver}}.zip - path: bin/release/${targetName}.app + name: ${{ env.targetName }}_${{matrix.qt_ver}}.zip + path: bin/release/${{ env.targetName }}.app # tag 上传Release - name: uploadRelease if: startsWith(github.event.ref, 'refs/tags/') diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ad72c64..405afec 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -32,13 +32,13 @@ jobs: qt_arch: [gcc_64] steps: - name: Install Qt - uses: jurplel/install-qt-action@v2.10.0 + uses: jurplel/install-qt-action@v2.13.0 with: version: ${{ matrix.qt_ver }} cached: 'false' - name: ubuntu install GL library run: sudo apt-get install -y libglew-dev libglfw3-dev - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 submodules: 'true' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7b35f03..4936b15 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -67,17 +67,16 @@ jobs: # 安装Qt - name: Install Qt # 使用外部action。这个action专门用来安装Qt - uses: jurplel/install-qt-action@v2.10.0 + uses: jurplel/install-qt-action@v2.13.0 with: # Version of Qt to install version: ${{ matrix.qt_ver }} # Target platform for build # target: ${{ matrix.qt_target }} arch: ${{ matrix.qt_arch }} - aqtversion: '==0.10.0' cached: 'false' # 拉取代码 - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 submodules: 'true' diff --git a/examples/TaoQuickShow/TaoQuickShow.pro b/examples/TaoQuickShow/TaoQuickShow.pro index 8dd02d4..a7ab6de 100644 --- a/examples/TaoQuickShow/TaoQuickShow.pro +++ b/examples/TaoQuickShow/TaoQuickShow.pro @@ -3,7 +3,7 @@ TARGET = TaoQuickShow QT += core gui qml quick -CONFIG += c++1z qtquickcompiler utf8_source +CONFIG += c++17 qtquickcompiler utf8_source load(taoVersion) setTaoVersion()