Skip to content

Commit f654124

Browse files
authored
Make Clang 6 the basic build test configuration (#55059)
1 parent 07de00c commit f654124

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

.github/workflows/matrix.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,34 @@ jobs:
7474
max-parallel: ${{ fromJSON(needs.matrix-variables.outputs.max_parallel) }}
7575
matrix:
7676
include:
77+
- compiler: clang++-6.0
78+
os: ubuntu-18.04
79+
tiles: 0
80+
sound: 0
81+
release: 1
82+
cmake: 0
83+
localize: 1
84+
test-stage: 1
85+
native: linux64
86+
archive-success: basic-build
87+
dont_skip_data_only_changes: 1
88+
title: Basic Build and Test (Clang 6, Ubuntu, Curses)
89+
# ~190MB in a clean build
90+
# ~30MB compressed
91+
# .16 : 1 -> max ~485MB
92+
ccache_limit: 3G
93+
7794
- compiler: g++-9
7895
os: ubuntu-latest
7996
release: 1
8097
cmake: 0
8198
tiles: 0
8299
sound: 0
83100
localize: 1
84-
test-stage: 1
85101
gold: 1
86102
lto: 1
87103
native: linux64
88-
archive-success: basic-build
89-
dont_skip_data_only_changes: 1
90-
title: Basic Build and Test (GCC 9, Curses, LTO)
104+
title: GCC 9, Curses, LTO
91105
# ~850MB in a clean build
92106
# ~370MB compressed
93107
# .44 : 1 -> max ~1.8G
@@ -148,7 +162,6 @@ jobs:
148162
tiles: 1
149163
sound: 1
150164
localize: 1
151-
test-stage: 1
152165
title: GCC 11, Ubuntu cross-compile to MinGW-Win64, Tiles, Sound
153166
ldflags: -static-libgcc -static-libstdc++
154167
mxe_target: x86_64-w64-mingw32.static.gcc11
@@ -158,20 +171,6 @@ jobs:
158171
# .12 : 1 -> max ~390MB
159172
ccache_limit: 3G
160173

161-
- compiler: clang++-6.0
162-
os: ubuntu-18.04
163-
tiles: 0
164-
sound: 0
165-
release: 1
166-
cmake: 0
167-
localize: 1
168-
native: linux64
169-
title: Clang 6, Ubuntu, Curses, Release
170-
# ~190MB in a clean build
171-
# ~30MB compressed
172-
# .16 : 1 -> max ~485MB
173-
ccache_limit: 3G
174-
175174
- compiler: g++-7
176175
os: ubuntu-18.04
177176
release: 1
@@ -213,7 +212,7 @@ jobs:
213212
CCACHE_FILECLONE: true
214213
CCACHE_HARDLINK: true
215214
CCACHE_NOCOMPRESS: true
216-
SKIP: ${{ ( github.event.pull_request.draft == true && matrix.title != 'Basic Build and Test (GCC 9, Curses, LTO)' ) || ( matrix.dont_skip_data_only_changes == 0 && needs.skip-duplicates.outputs.should_skip_code == 'true' ) || ( matrix.dont_skip_data_only_changes != 0 && needs.skip-duplicates-mods.outputs.should_skip_data == 'true' ) }}
215+
SKIP: ${{ ( github.event.pull_request.draft == true && matrix.title != 'Basic Build and Test (Clang 6, Ubuntu, Curses)' ) || ( matrix.dont_skip_data_only_changes == 0 && needs.skip-duplicates.outputs.should_skip_code == 'true' ) || ( matrix.dont_skip_data_only_changes != 0 && needs.skip-duplicates-mods.outputs.should_skip_data == 'true' ) }}
217216
SKIP_TESTS: ${{ needs.matrix-variables.outputs.skip_tests }}
218217
steps:
219218
- name: checkout repository

0 commit comments

Comments
 (0)