Skip to content

Commit aaa1603

Browse files
committed
More fixes for test builds
Signed-off-by: Jean-Francois Panisset <[email protected]>
1 parent 53a714b commit aaa1603

File tree

1 file changed

+21
-57
lines changed

1 file changed

+21
-57
lines changed

.github/workflows/docker-builds.yml

Lines changed: 21 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Free up disk space
5454
run: |
5555
df -h
56-
sudo apt-get remove -y '^llvm-.*' 'php.*' '^cpp.*' '^g\+\+.*' '^clang.*' '^gfortran.*' \
56+
sudo apt-get remove -y '^llvm-.*' '^php.*' '^php8.*' '^cpp.*' '^g\+\+.*' '^clang.*' '^gfortran.*' \
5757
'^dotnet-.*' '^libmono-.*' '^mono-.*' monodoc-http '^r-.*' '^ruby.*' \
5858
ant ant-optional aria2 azure-cli firefox google-chrome-stable microsoft-edge-stable powershell \
5959
imagemagick '^imagemagick-.*' '^libmagickcore-.*' '^libmagickwand-.*' kubectl mercurial mercurial-common subversion
@@ -78,8 +78,6 @@ jobs:
7878
run: |
7979
set -ex
8080
pipenv run aswfdocker \
81-
--repo-uri $GITHUB_REPOSITORY \
82-
--source-branch $GITHUB_REF \
8381
--verbose \
8482
build \
8583
--ci-image-type IMAGE \
@@ -91,8 +89,6 @@ jobs:
9189
run: |
9290
set -ex
9391
pipenv run aswfdocker \
94-
--repo-uri $GITHUB_REPOSITORY \
95-
--source-branch $GITHUB_REF \
9692
--verbose \
9793
build \
9894
--ci-image-type PACKAGE \
@@ -101,28 +97,26 @@ jobs:
10197
--use-conan \
10298
--build-missing \
10399
--target ninja \
104-
--target cmake
100+
--target cmake \
101+
--push NO
105102
106103
- name: Build Clang (Conan)
107104
run: |
108105
set -ex
109106
pipenv run aswfdocker \
110-
--repo-uri $GITHUB_REPOSITORY \
111-
--source-branch $GITHUB_REF \
112107
--verbose \
113108
build \
114109
--ci-image-type PACKAGE \
115110
--group common \
116111
--version ${{ matrix.common_version }} \
117112
--use-conan \
118113
--build-missing \
119-
--target clang
114+
--target clang \
115+
--push NO
120116
121117
- name: Build ci-common Docker Image for downstream images
122118
run: |
123119
pipenv run aswfdocker \
124-
--repo-uri $GITHUB_REPOSITORY \
125-
--source-branch $GITHUB_REF \
126120
--verbose \
127121
build \
128122
--ci-image-type IMAGE \
@@ -134,120 +128,110 @@ jobs:
134128
run: |
135129
set -ex
136130
pipenv run aswfdocker \
137-
--repo-uri $GITHUB_REPOSITORY \
138-
--source-branch $GITHUB_REF \
139131
--verbose \
140132
build \
141133
--ci-image-type PACKAGE \
142134
--group base1-wrappers \
143135
--version ${{ matrix.version_noclang }} \
144136
--use-conan \
145-
--build-missing
137+
--build-missing \
138+
--push NO
146139
147140
- name: Build base1 level 1 Conan packages
148141
run: |
149142
set -ex
150143
pipenv run aswfdocker \
151-
--repo-uri $GITHUB_REPOSITORY \
152-
--source-branch $GITHUB_REF \
153144
--verbose \
154145
build \
155146
--ci-image-type PACKAGE \
156147
--group base1-1 \
157148
--version ${{ matrix.version_noclang }} \
158149
--use-conan \
159-
--build-missing
150+
--build-missing \
151+
--push NO
160152
161153
- name: Build base1 level 2 Conan packages
162154
run: |
163155
set -ex
164156
pipenv run aswfdocker \
165-
--repo-uri $GITHUB_REPOSITORY \
166-
--source-branch $GITHUB_REF \
167157
--verbose \
168158
build \
169159
--ci-image-type PACKAGE \
170160
--group base1-2 \
171161
--version ${{ matrix.version_noclang }} \
172162
--use-conan \
173-
--build-missing
163+
--build-missing \
164+
--push NO
174165
175166
- name: Build base1 level 3 Conan packages
176167
run: |
177168
set -ex
178169
pipenv run aswfdocker \
179-
--repo-uri $GITHUB_REPOSITORY \
180-
--source-branch $GITHUB_REF \
181170
--verbose \
182171
build \
183172
--ci-image-type PACKAGE \
184173
--group base1-3 \
185174
--version ${{ matrix.version_noclang }} \
186175
--use-conan \
187-
--build-missing
176+
--build-missing \
177+
--push NO
188178
189179
- name: Build base2 system wrapper Conan packages for ci-baseqt image
190180
run: |
191181
set -ex
192182
pipenv run aswfdocker \
193-
--repo-uri $GITHUB_REPOSITORY \
194-
--source-branch $GITHUB_REF \
195183
--verbose \
196184
build \
197185
--ci-image-type PACKAGE \
198186
--group base2-wrappers \
199187
--version ${{ matrix.version_noclang }} \
200188
--use-conan \
201-
--build-missing
189+
--build-missing \
190+
--push NO
202191
203192
- name: Build base2 system Conan packages for ci-baseqt image
204193
run: |
205194
set -ex
206195
pipenv run aswfdocker \
207-
--repo-uri $GITHUB_REPOSITORY \
208-
--source-branch $GITHUB_REF \
209196
--verbose \
210197
build \
211198
--ci-image-type PACKAGE \
212199
--group base2-1
213200
--version ${{ matrix.version_noclang }} \
214201
--use-conan \
215-
--build-missing
202+
--build-missing \
203+
--push NO
216204
217205
- name: Build base2 level 2 Conan packages (Qt) for ci-baseqt image
218206
run: |
219207
set -ex
220208
pipenv run aswfdocker \
221-
--repo-uri $GITHUB_REPOSITORY \
222-
--source-branch $GITHUB_REF \
223209
--verbose \
224210
build \
225211
--ci-image-type PACKAGE \
226212
--group base2-2 \
227213
--version ${{ matrix.version_noclang }} \
228214
--use-conan \
229-
--build-missing
215+
--build-missing \
216+
--push NO
230217
231218
- name: Build base3 Conan packages (PySide) for base image
232219
run: |
233220
set -ex
234221
pipenv run aswfdocker \
235-
--repo-uri $GITHUB_REPOSITORY \
236-
--source-branch $GITHUB_REF \
237222
--verbose \
238223
build \
239224
--ci-image-type PACKAGE \
240225
--group base3 \
241226
--version ${{ matrix.version_noclang }} \
242227
--use-conan \
243-
--build-missing
228+
--build-missing \
229+
--push NO
244230
245231
- name: Build base and baseqt images
246232
run: |
247233
set -ex
248234
pipenv run aswfdocker \
249-
--repo-uri $GITHUB_REPOSITORY \
250-
--source-branch $GITHUB_REF \
251235
--verbose \
252236
build \
253237
--ci-image-type IMAGE \
@@ -259,8 +243,6 @@ jobs:
259243
run: |
260244
set -ex
261245
pipenv run aswfdocker \
262-
--repo-uri $GITHUB_REPOSITORY \
263-
--source-branch $GITHUB_REF \
264246
--verbose \
265247
build \
266248
--ci-image-type PACKAGE \
@@ -274,8 +256,6 @@ jobs:
274256
run: |
275257
set -ex
276258
pipenv run aswfdocker \
277-
--repo-uri $GITHUB_REPOSITORY \
278-
--source-branch $GITHUB_REF \
279259
--verbose \
280260
build \
281261
--ci-image-type PACKAGE \
@@ -289,8 +269,6 @@ jobs:
289269
run: |
290270
set -ex
291271
pipenv run aswfdocker \
292-
--repo-uri $GITHUB_REPOSITORY \
293-
--source-branch $GITHUB_REF \
294272
--verbose \
295273
build \
296274
--ci-image-type PACKAGE \
@@ -304,8 +282,6 @@ jobs:
304282
run: |
305283
set -ex
306284
pipenv run aswfdocker \
307-
--repo-uri $GITHUB_REPOSITORY \
308-
--source-branch $GITHUB_REF \
309285
--verbose \
310286
build \
311287
--ci-image-type PACKAGE \
@@ -319,8 +295,6 @@ jobs:
319295
run: |
320296
set -ex
321297
pipenv run aswfdocker \
322-
--repo-uri $GITHUB_REPOSITORY \
323-
--source-branch $GITHUB_REF \
324298
--verbose \
325299
build \
326300
--ci-image-type PACKAGE \
@@ -334,8 +308,6 @@ jobs:
334308
run: |
335309
set -ex
336310
pipenv run aswfdocker \
337-
--repo-uri $GITHUB_REPOSITORY \
338-
--source-branch $GITHUB_REF \
339311
--verbose \
340312
build \
341313
--ci-image-type PACKAGE \
@@ -349,8 +321,6 @@ jobs:
349321
run: |
350322
set -ex
351323
pipenv run aswfdocker \
352-
--repo-uri $GITHUB_REPOSITORY \
353-
--source-branch $GITHUB_REF \
354324
--verbose \
355325
build \
356326
--ci-image-type PACKAGE \
@@ -364,8 +334,6 @@ jobs:
364334
run: |
365335
set -ex
366336
pipenv run aswfdocker \
367-
--repo-uri $GITHUB_REPOSITORY \
368-
--source-branch $GITHUB_REF \
369337
--verbose \
370338
build \
371339
--ci-image-type PACKAGE \
@@ -378,8 +346,6 @@ jobs:
378346
run: |
379347
set -ex
380348
pipenv run aswfdocker \
381-
--repo-uri $GITHUB_REPOSITORY \
382-
--source-branch $GITHUB_REF \
383349
--verbose \
384350
build \
385351
--ci-image-type IMAGE \
@@ -392,8 +358,6 @@ jobs:
392358
run: |
393359
set -ex
394360
pipenv run aswfdocker \
395-
--repo-uri $GITHUB_REPOSITORY \
396-
--source-branch $GITHUB_REF \
397361
--verbose \
398362
build \
399363
--ci-image-type IMAGE \

0 commit comments

Comments
 (0)