Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 04b7b82

Browse files
Skycoder42Skycoder42
committed
update ci to 5.14.1
1 parent 9af7cf0 commit 04b7b82

File tree

1 file changed

+30
-127
lines changed

1 file changed

+30
-127
lines changed

‎.github/workflows/build.yml

+30-127
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
@@ -22,46 +22,45 @@ jobs:
2222
- mingw73_32
2323
- clang_64
2424
- ios
25+
mode:
26+
- json
27+
- generic
2528

2629
include:
2730
- platform: gcc_64
2831
os: ubuntu-latest
29-
repository: linux_x64
3032
- platform: android
3133
os: ubuntu-latest
32-
repository: linux_x64
3334
- platform: wasm_32
3435
os: ubuntu-latest
35-
repository: linux_x64
3636
emsdk: sdk-fastcomp-1.38.27-64bit
3737
- platform: msvc2017_64
38-
os: windows-2016
39-
repository: windows_x86
38+
os: windows-latest
4039
- platform: msvc2017
41-
os: windows-2016
42-
repository: windows_x86
40+
os: windows-latest
4341
- platform: winrt_x64_msvc2017
44-
os: windows-2016
45-
repository: windows_x86
42+
os: windows-latest
4643
- platform: winrt_x86_msvc2017
47-
os: windows-2016
48-
repository: windows_x86
44+
os: windows-latest
4945
- platform: winrt_armv7_msvc2017
5046
os: windows-2016
51-
repository: windows_x86
5247
- platform: mingw73_64
5348
os: windows-latest
54-
repository: windows_x86
5549
- platform: mingw73_32
5650
os: windows-latest
5751
extra-flags: CONFIG+=no_coroutine_tests
58-
repository: windows_x86
5952
- platform: clang_64
6053
os: macos-latest
61-
repository: mac_x64
6254
- platform: ios
6355
os: macos-latest
64-
repository: mac_x64
56+
57+
- mode: json
58+
keysuffix: no-json
59+
qtpackages: qtnetworkauth
60+
config: CONFIG+=no_json_serializer
61+
- mode: generic
62+
keysuffix: json
63+
qtpackages: qtnetworkauth,skycoder42.jsonserializer
6564

6665
runs-on: ${{matrix.os}}
6766
steps:
@@ -85,14 +84,14 @@ jobs:
8584
id: cache-qt
8685
with:
8786
path: qt/${{matrix.version}}/${{matrix.platform}}
88-
key: qt-${{matrix.version}}-${{matrix.platform}}-json
87+
key: qt-${{matrix.version}}-${{matrix.platform}}-${{matrix.keysuffix}}
8988
- uses: Skycoder42/action-setup-qt@master
9089
id: qt
9190
with:
9291
version: ${{matrix.version}}
9392
platform: ${{matrix.platform}}
94-
packages: qtnetworkauth,skycoder42.jsonserializer
95-
install-args: --addRepository https://install.skycoder42.de/qtmodules/${{matrix.repository}} --verbose
93+
packages: ${{matrix.qtpackages}}
94+
flat-sources: https://install.skycoder42.de/qtmodules/
9695
cachedir: qt/${{matrix.version}}/${{matrix.platform}}
9796
- name: build qthttpserver
9897
if: steps.cache-qt.outputs.cache-hit != 'true' && !contains(matrix.platform, 'mingw')
@@ -107,30 +106,30 @@ jobs:
107106
run: 7z x "src/3rdparty/qthttpserver-${{matrix.platform}}.zip" "-o${{steps.qt.outputs.qtdir}}" -aoa -y
108107
- name: qmake
109108
run: |
110-
qmake CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} ${{matrix.extra-flags}}
109+
qmake CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} ${{matrix.config}} ${{matrix.extra-flags}}
111110
${{steps.qt.outputs.make}} qmake_all
112111
- name: make module
113112
run: |
114113
${{steps.qt.outputs.make}}
115114
${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
116115
- name: make tests
117-
if: steps.qt.outputs.tests == 'true'
116+
if: steps.qt.outputs.tests == 'true' && matrix.mode == 'generic'
118117
run: |
119118
${{steps.qt.outputs.make}} all
120119
${{steps.qt.outputs.make}} ${{steps.qt.outputs.testflags}} run-tests
121120
- name: make examples
122-
if: matrix.platform == 'gcc_64'
121+
if: matrix.platform == 'gcc_64' && matrix.mode == 'generic'
123122
run: |
124123
${{steps.qt.outputs.make}} sub-examples
125124
cd examples && ${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
126125
- name: make doc
127-
if: matrix.platform == 'gcc_64'
126+
if: matrix.platform == 'gcc_64' && matrix.mode == 'generic'
128127
run: |
129128
${{steps.qt.outputs.make}} doxygen
130129
cd doc && ${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
131130
- name: upload module to releases
132131
uses: Skycoder42/action-upload-release@master
133-
if: startsWith(github.ref, 'refs/tags/')
132+
if: startsWith(github.ref, 'refs/tags/') && matrix.mode == 'generic'
134133
with:
135134
repo_token: ${{secrets.GITHUB_TOKEN}}
136135
directory: ${{steps.qt.outputs.outdir}}/${{matrix.version}}
@@ -139,129 +138,33 @@ jobs:
139138
overwrite: true
140139
- name: upload examples to releases
141140
uses: Skycoder42/action-upload-release@master
142-
if: matrix.platform == 'gcc_64' && startsWith(github.ref, 'refs/tags/')
141+
if: matrix.platform == 'gcc_64' && startsWith(github.ref, 'refs/tags/') && matrix.mode == 'generic'
143142
with:
144143
repo_token: ${{secrets.GITHUB_TOKEN}}
145-
directory: ${{steps.qt.outputs.outdir}}/Examples
144+
directory: ${{steps.qt.outputs.outdir}}/${{matrix.version}}/${{matrix.platform}}/examples
146145
asset_name: qtrestclient-examples-${{matrix.version}}
147146
tag: ${{github.ref}}
148147
overwrite: true
149148
- name: upload doc to releases
150149
uses: Skycoder42/action-upload-release@master
151-
if: matrix.platform == 'gcc_64' && startsWith(github.ref, 'refs/tags/')
150+
if: matrix.platform == 'gcc_64' && startsWith(github.ref, 'refs/tags/') && matrix.mode == 'generic'
152151
with:
153152
repo_token: ${{secrets.GITHUB_TOKEN}}
154-
directory: ${{steps.qt.outputs.outdir}}/Docs
153+
directory: ${{steps.qt.outputs.outdir}}/${{matrix.version}}/${{matrix.platform}}/doc
155154
asset_name: qtrestclient-doc-${{matrix.version}}
156155
tag: ${{github.ref}}
157156
overwrite: true
158157

159-
build-no-json:
160-
strategy:
161-
fail-fast: false
162-
matrix:
163-
version:
164-
- 5.14.0
165-
platform:
166-
- gcc_64
167-
- android
168-
- wasm_32
169-
- msvc2017_64
170-
- msvc2017
171-
- winrt_x64_msvc2017
172-
- winrt_x86_msvc2017
173-
- winrt_armv7_msvc2017
174-
- mingw73_64
175-
- mingw73_32
176-
- clang_64
177-
- ios
178-
179-
include:
180-
- platform: gcc_64
181-
os: ubuntu-latest
182-
- platform: android
183-
os: ubuntu-latest
184-
- platform: wasm_32
185-
os: ubuntu-latest
186-
emsdk: sdk-fastcomp-1.38.27-64bit
187-
- platform: msvc2017_64
188-
os: windows-2016
189-
- platform: msvc2017
190-
os: windows-2016
191-
- platform: winrt_x64_msvc2017
192-
os: windows-2016
193-
- platform: winrt_x86_msvc2017
194-
os: windows-2016
195-
- platform: winrt_armv7_msvc2017
196-
os: windows-2016
197-
- platform: mingw73_64
198-
os: windows-latest
199-
- platform: mingw73_32
200-
os: windows-latest
201-
- platform: clang_64
202-
os: macos-latest
203-
- platform: ios
204-
os: macos-latest
205-
206-
runs-on: ${{matrix.os}}
207-
steps:
208-
- uses: actions/checkout@v1
209-
with:
210-
submodules: recursive
211-
- uses: actions/setup-python@v1
212-
- name: actions/cache emsdk
213-
uses: actions/cache@v1
214-
if: matrix.platform == 'wasm_32'
215-
with:
216-
path: emsdk-cache
217-
key: ${{runner.os}}-emsdk-${{matrix.emsdk}}
218-
- uses: mymindstorm/setup-emsdk@v3
219-
if: matrix.platform == 'wasm_32'
220-
with:
221-
version: ${{matrix.emsdk}}
222-
actions-cache-folder: emsdk-cache
223-
- name: actions/cache qt
224-
uses: actions/cache@v1
225-
id: cache-qt
226-
with:
227-
path: qt/${{matrix.version}}/${{matrix.platform}}
228-
key: qt-${{matrix.version}}-${{matrix.platform}}-no-json
229-
- uses: Skycoder42/action-setup-qt@master
230-
id: qt
231-
with:
232-
version: ${{matrix.version}}
233-
platform: ${{matrix.platform}}
234-
packages: qtnetworkauth
235-
install-args: --verbose
236-
cachedir: qt/${{matrix.version}}/${{matrix.platform}}
237-
- name: build qthttpserver
238-
if: steps.cache-qt.outputs.cache-hit != 'true' && !contains(matrix.platform, 'mingw')
239-
run: |
240-
qmake
241-
${{steps.qt.outputs.make}} qmake_all
242-
${{steps.qt.outputs.make}}
243-
${{steps.qt.outputs.make}} install
244-
working-directory: src/3rdparty/qthttpserver
245-
- name: unpack qthttpserver
246-
if: steps.cache-qt.outputs.cache-hit != 'true' && contains(matrix.platform, 'mingw')
247-
run: 7z x "src/3rdparty/qthttpserver-${{matrix.platform}}.zip" "-o${{steps.qt.outputs.qtdir}}" -aoa -y
248-
- name: qmake
249-
run: |
250-
qmake CONFIG+=install_ok CONFIG+=no_json_serializer QT_PLATFORM=${{matrix.platform}}
251-
${{steps.qt.outputs.make}} qmake_all
252-
- name: make module
253-
run: ${{steps.qt.outputs.make}}
254-
255158
deploy:
256159
if: startsWith(github.ref, 'refs/tags/')
257-
needs: [build, build-no-json]
160+
needs: build
258161
runs-on: ubuntu-latest
259162
steps:
260163
- uses: actions/setup-python@v1
261164
- uses: Skycoder42/action-deploy-qt@master
262165
with:
263166
token: ${{secrets.GITHUB_TOKEN}}
264-
version: 5.14.0
167+
version: 5.14.1
265168
host: ${{secrets.SSHFS_HOST}}
266169
key: ${{secrets.SSHFS_KEY}}
267170
port: ${{secrets.SSHFS_PORT}}

0 commit comments

Comments
 (0)