From bdc5b71edacf83d02d1894bcf03df452194b5555 Mon Sep 17 00:00:00 2001 From: Dom Chen Date: Thu, 26 Oct 2023 10:49:07 +0700 Subject: [PATCH 1/2] fix codecov action warning --- .github/workflows/autotest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml index 786291b5..a0eded17 100644 --- a/.github/workflows/autotest.yml +++ b/.github/workflows/autotest.yml @@ -67,7 +67,7 @@ jobs: ./codecov.sh - name: Upload Codecov - uses: codecov/codecov-action@v2.1.0 + uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} file: result/coverage.xml From f835e8946c401a881c2bde14910a42509ec4797c Mon Sep 17 00:00:00 2001 From: Dom Chen Date: Thu, 26 Oct 2023 11:10:45 +0700 Subject: [PATCH 2/2] Update build.yml --- .github/workflows/build.yml | 52 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e54e88db..309aca6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -327,7 +327,7 @@ jobs: name: tgfx_win_x64 path: out/release - qt: + linux: runs-on: ubuntu-latest steps: - name: Check Out Repo @@ -342,8 +342,8 @@ jobs: path: | third_party vendor_tools - key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - restore-keys: third-party-qt- + key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} + restore-keys: third-party-linux- - uses: seanmiddleditch/gha-setup-ninja@master @@ -353,19 +353,9 @@ jobs: depsync shell: bash - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - host: 'linux' - target: 'desktop' - dir: '${{github.workspace}}/qt/' - install-deps: 'true' - cache: 'true' - cache-key-prefix: 'install-qt-action' - - - name: Build QT + - name: Build Linux run: | - node build_tgfx -DTGFX_USE_QT=ON -DCMAKE_PREFIX_PATH="${{env.Qt5_Dir}}/lib/cmake/" -p linux + node build_tgfx -DTGFX_USE_SWIFTSHADER=ON -p linux - name: Save Third-Party Cache if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }} @@ -374,21 +364,21 @@ jobs: path: | third_party vendor_tools - key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} + key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - name: Job Failed if: ${{ failure() }} uses: actions/upload-artifact@v3 with: - name: tgfx_qt_x64 + name: tgfx_linux_x64 path: out/release - uses: actions/upload-artifact@v3 with: - name: tgfx_qt_x64 + name: tgfx_linux_x64 path: out/release - linux: + qt: runs-on: ubuntu-latest steps: - name: Check Out Repo @@ -403,8 +393,8 @@ jobs: path: | third_party vendor_tools - key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - restore-keys: third-party-linux- + key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} + restore-keys: third-party-qt- - uses: seanmiddleditch/gha-setup-ninja@master @@ -414,9 +404,19 @@ jobs: depsync shell: bash - - name: Build Linux + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + host: 'linux' + target: 'desktop' + dir: '${{github.workspace}}/qt/' + install-deps: 'true' + cache: 'true' + cache-key-prefix: 'install-qt-action' + + - name: Build QT run: | - node build_tgfx -DTGFX_USE_SWIFTSHADER=ON -p linux + node build_tgfx -DTGFX_USE_QT=ON -DCMAKE_PREFIX_PATH="${{env.Qt5_Dir}}/lib/cmake/" -p linux - name: Save Third-Party Cache if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }} @@ -425,16 +425,16 @@ jobs: path: | third_party vendor_tools - key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} + key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }} - name: Job Failed if: ${{ failure() }} uses: actions/upload-artifact@v3 with: - name: tgfx_linux_x64 + name: tgfx_qt_x64 path: out/release - uses: actions/upload-artifact@v3 with: - name: tgfx_linux_x64 + name: tgfx_qt_x64 path: out/release