Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix codecov action warning #12

Merged
merged 2 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/autotest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ jobs:
name: tgfx_win_x64
path: out/release

qt:
linux:
runs-on: ubuntu-latest
steps:
- name: Check Out Repo
Expand All @@ -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

Expand All @@ -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') }}
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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') }}
Expand All @@ -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