Skip to content

Commit 8041a19

Browse files
Skycoder42Skycoder42
committed
update ci to 5.14.1
1 parent d9218b8 commit 8041a19

File tree

3 files changed

+26
-39
lines changed

3 files changed

+26
-39
lines changed

‎.github/workflows/build.yml‎

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
fail-fast: false
99
matrix:
1010
version:
11-
- 5.14.0
11+
- 5.14.1
1212
platform:
1313
- gcc_64
1414
- android
@@ -26,39 +26,33 @@ jobs:
2626
include:
2727
- platform: gcc_64
2828
os: ubuntu-latest
29-
qtifw-host: linux
3029
- platform: android
3130
os: ubuntu-latest
3231
- platform: wasm_32
3332
os: ubuntu-latest
3433
emsdk: sdk-fastcomp-1.38.27-64bit
3534
- platform: msvc2017_64
36-
os: windows-2016
37-
qtifw-host: windows
35+
os: windows-latest
3836
- platform: msvc2017
39-
os: windows-2016
40-
qtifw-host: windows
37+
os: windows-latest
4138
- platform: winrt_x64_msvc2017
42-
os: windows-2016
39+
os: windows-latest
4340
- platform: winrt_x86_msvc2017
44-
os: windows-2016
41+
os: windows-latest
4542
- platform: winrt_armv7_msvc2017
4643
os: windows-2016
4744
- platform: mingw73_64
4845
os: windows-latest
49-
qtifw-host: windows
5046
- platform: mingw73_32
5147
os: windows-latest
52-
qtifw-host: windows
5348
- platform: clang_64
5449
os: macos-latest
55-
qtifw-host: mac
5650
- platform: ios
5751
os: macos-latest
5852

5953
runs-on: ${{matrix.os}}
6054
steps:
61-
- uses: actions/checkout@v1
55+
- uses: actions/checkout@v2
6256
with:
6357
submodules: recursive
6458
- uses: actions/setup-python@v1
@@ -84,19 +78,22 @@ jobs:
8478
with:
8579
version: ${{matrix.version}}
8680
platform: ${{matrix.platform}}
87-
install-args: --verbose
81+
packages: qt.tools.ifw.32
8882
cachedir: qt/${{matrix.version}}/${{matrix.platform}}
89-
- name: build qthttpserver
90-
if: steps.cache-qt.outputs.cache-hit != 'true' && !contains(matrix.platform, 'mingw')
83+
- name: download qthttpserver precompiled binary
84+
if: steps.cache-qt.outputs.cache-hit != 'true' && matrix.os == 'windows-latest'
85+
shell: bash
86+
run: |
87+
curl -Lo "src/3rdparty/qthttpserver-binary.zip" 'https://github.com/Skycoder42/qt5-httpserver-build/releases/download/${{matrix.version}}/qthttpserver-${{matrix.platform}}-${{matrix.version}}.zip'
88+
7z x "src/3rdparty/qthttpserver-binary.zip" "-o${{steps.qt.outputs.qtdir}}/.." -aoa -y
89+
- name: build and install qthttpserver
90+
if: steps.cache-qt.outputs.cache-hit != 'true' && matrix.os != 'windows-latest'
91+
working-directory: src/3rdparty/qthttpserver
9192
run: |
9293
qmake
9394
${{steps.qt.outputs.make}} qmake_all
9495
${{steps.qt.outputs.make}}
9596
${{steps.qt.outputs.make}} install
96-
working-directory: src/3rdparty/qthttpserver
97-
- name: unpack qthttpserver
98-
if: steps.cache-qt.outputs.cache-hit != 'true' && contains(matrix.platform, 'mingw')
99-
run: 7z x "src/3rdparty/qthttpserver-${{matrix.platform}}.zip" "-o${{steps.qt.outputs.qtdir}}" -aoa -y
10097
- name: install packagekit
10198
if: matrix.platform == 'gcc_64'
10299
run: |
@@ -118,14 +115,9 @@ jobs:
118115
${{steps.qt.outputs.make}} install
119116
pkg-config --exists packagekitqt5
120117
working-directory: src/3rdparty/PackageKit-Qt
121-
- name: install QtIfw to cache
122-
if: steps.cache-qt.outputs.cache-hit != 'true' && steps.qt.outputs.tests == 'true'
123-
run: |
124-
python -m pip install aqtinstall
125-
python -m aqt tool ${{matrix.qtifw-host}} tools_ifw 3.1.1 qt.tools.ifw.31 --outputdir ${{steps.qt.outputs.qtdir}}/qtifw --internal
126118
- name: copy QtIfw from cache
127119
if: steps.qt.outputs.tests == 'true'
128-
run: cp -a "${{steps.qt.outputs.qtdir}}/qtifw/Tools" "${{steps.qt.outputs.qtdir}}/../../"
120+
run: cp -a "${{steps.qt.outputs.qtdir}}/Tools" "${{steps.qt.outputs.qtdir}}/../../"
129121
shell: bash
130122
- name: qmake
131123
run: |
@@ -135,9 +127,6 @@ jobs:
135127
run: |
136128
${{steps.qt.outputs.make}}
137129
${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
138-
- name: update homebrew cache to prevent timeout
139-
if: matrix.platform == 'clang_64'
140-
run: brew update
141130
- name: make tests
142131
if: steps.qt.outputs.tests == 'true' && !contains(matrix.platform, 'mingw')
143132
run: |
@@ -167,7 +156,7 @@ jobs:
167156
if: matrix.platform == 'gcc_64' && startsWith(github.ref, 'refs/tags/')
168157
with:
169158
repo_token: ${{secrets.GITHUB_TOKEN}}
170-
directory: ${{steps.qt.outputs.outdir}}/Examples
159+
directory: ${{steps.qt.outputs.outdir}}/${{matrix.version}}/${{matrix.platform}}/examples
171160
asset_name: qtautoupdater-examples-${{matrix.version}}
172161
tag: ${{github.ref}}
173162
overwrite: true
@@ -176,7 +165,7 @@ jobs:
176165
if: matrix.platform == 'gcc_64' && startsWith(github.ref, 'refs/tags/')
177166
with:
178167
repo_token: ${{secrets.GITHUB_TOKEN}}
179-
directory: ${{steps.qt.outputs.outdir}}/Docs
168+
directory: ${{steps.qt.outputs.outdir}}/${{matrix.version}}/${{matrix.platform}}/doc
180169
asset_name: qtautoupdater-doc-${{matrix.version}}
181170
tag: ${{github.ref}}
182171
overwrite: true
@@ -194,7 +183,7 @@ jobs:
194183
- uses: Skycoder42/action-deploy-qt@master
195184
with:
196185
token: ${{secrets.GITHUB_TOKEN}}
197-
version: 5.14.0
186+
version: 5.14.1
198187
host: ${{secrets.SSHFS_HOST}}
199188
key: ${{secrets.SSHFS_KEY}}
200189
port: ${{secrets.SSHFS_PORT}}

‎tests/auto/plugins/testlib/testlib.pri‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
win32:CONFIG(release, debug|release): LIBS += -L$$shadowed($$PWD)/release/ -ltestlib
2-
else:win32:CONFIG(debug, debug|release): LIBS += -L$$shadowed($$PWD)/debug/ -ltestlib
3-
else:unix: LIBS += -L$$shadowed($$PWD)/ -ltestlib
1+
win32:!win32-g++:CONFIG(release, debug|release): LIBS += -L$$shadowed($$PWD)/release/ -ltestlib
2+
else:win32:!win32-g++:CONFIG(debug, debug|release): LIBS += -L$$shadowed($$PWD)/debug/ -ltestlib
3+
else: LIBS += -L$$shadowed($$PWD)/ -ltestlib
44

55
INCLUDEPATH += $$PWD/
66
DEPENDPATH += $$PWD/
77

8-
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$shadowed($$PWD)/release/libtestlib.a
9-
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$shadowed($$PWD)/debug/libtestlib.a
10-
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$shadowed($$PWD)/release/testlib.lib
8+
win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$shadowed($$PWD)/release/testlib.lib
119
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$shadowed($$PWD)/debug/testlib.lib
12-
else:unix: PRE_TARGETDEPS += $$shadowed($$PWD)/libtestlib.a
10+
else: PRE_TARGETDEPS += $$shadowed($$PWD)/libtestlib.a

‎tests/auto/testrun.pri‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
win32:!ReleaseBuild:!DebugBuild {
1+
debug_and_release:!ReleaseBuild:!DebugBuild {
22
runtarget.target = run-tests
33
runtarget.CONFIG = recursive
44
runtarget.recurse_target = run-tests

0 commit comments

Comments
 (0)