Skip to content

Commit ed9bf02

Browse files
committed
Improve gitlab CI
1 parent 476d0c9 commit ed9bf02

File tree

1 file changed

+98
-84
lines changed

1 file changed

+98
-84
lines changed

.gitlab-ci.yml

Lines changed: 98 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -51,41 +51,73 @@ workflow:
5151
script:
5252
- bash .gitlab/test.sh
5353

54+
.aarch64-linux:
55+
tags:
56+
- aarch64-linux
57+
image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
58+
59+
.armv7-linux:
60+
tags:
61+
- armv7-linux
62+
image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
63+
64+
.x86_64-linux-deb10:
65+
tags:
66+
- x86_64-linux
67+
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
68+
69+
.x86_64-linux-deb9:
70+
tags:
71+
- x86_64-linux
72+
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
73+
74+
.x86_64-linux-centos7:
75+
tags:
76+
- x86_64-linux
77+
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-centos7:$DOCKER_REV"
78+
79+
.x86_64-linux-fedora27:
80+
tags:
81+
- x86_64-linux
82+
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
83+
84+
.x86_64-linux-alpine:
85+
tags:
86+
- x86_64-linux
87+
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV"
88+
5489

5590
######################
5691
# aarch64 linux deb10
5792
######################
5893

5994
build-aarch64-linux-deb10:
60-
extends: .build
95+
extends:
96+
- .build
97+
- .aarch64-linux
6198
before_script:
6299
- sudo apt update
63100
- sudo apt install -y patchelf tree
64-
tags:
65-
- aarch64-linux
66-
image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
67101
variables:
68102
ADD_CABAL_ARGS: ""
69103

70104
tar-aarch64-linux-deb10:
71-
extends: .artifacts
105+
extends:
106+
- .artifacts
107+
- .aarch64-linux
72108
stage: tar
73109
needs: ["build-aarch64-linux-deb10"]
74-
tags:
75-
- aarch64-linux
76-
image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
77110
script:
78111
- ./.gitlab/tar.sh
79112
variables:
80113
TARBALL_ARCHIVE_SUFFIX: aarch64-deb10-linux
81114
TARBALL_EXT: tar.xz
82115

83116
test-aarch64-linux-deb10:
84-
extends: .test
117+
extends:
118+
- .test
119+
- .aarch64-linux
85120
needs: ["tar-aarch64-linux-deb10"]
86-
tags:
87-
- aarch64-linux
88-
image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
89121
before_script:
90122
- sudo apt update
91123
- sudo apt install -y tree
@@ -96,35 +128,32 @@ test-aarch64-linux-deb10:
96128
######################
97129

98130
build-armv7-linux-deb10:
99-
extends: .build
131+
extends:
132+
- .build
133+
- .armv7-linux
100134
before_script:
101135
- sudo apt update
102136
- sudo apt install -y patchelf tree
103-
tags:
104-
- armv7-linux
105-
image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
106137
variables:
107138
ADD_CABAL_ARGS: ""
108139

109140
tar-armv7-linux-deb10:
110-
extends: .artifacts
141+
extends:
142+
- .artifacts
143+
- .armv7-linux
111144
stage: tar
112145
needs: ["build-armv7-linux-deb10"]
113-
tags:
114-
- armv7-linux
115-
image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
116146
script:
117147
- ./.gitlab/tar.sh
118148
variables:
119149
TARBALL_ARCHIVE_SUFFIX: armv7-deb10-linux
120150
TARBALL_EXT: tar.xz
121151

122152
test-armv7-linux-deb10:
123-
extends: .test
153+
extends:
154+
- .test
155+
- .armv7-linux
124156
needs: ["tar-armv7-linux-deb10"]
125-
tags:
126-
- armv7-linux
127-
image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
128157
before_script:
129158
- sudo apt update
130159
- sudo apt install -y tree
@@ -135,35 +164,32 @@ test-armv7-linux-deb10:
135164
######################
136165

137166
build-x86_64-linux-deb10:
138-
extends: .build
167+
extends:
168+
- .build
169+
- .x86_64-linux-deb10
139170
before_script:
140171
- sudo apt update
141172
- sudo apt install -y patchelf tree
142-
tags:
143-
- x86_64-linux
144-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
145173
variables:
146174
ADD_CABAL_ARGS: "--enable-split-sections"
147175

148176
tar-x86_64-linux-deb10:
149-
extends: .artifacts
177+
extends:
178+
- .artifacts
179+
- .x86_64-linux-deb10
150180
stage: tar
151181
needs: ["build-x86_64-linux-deb10"]
152-
tags:
153-
- x86_64-linux
154-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
155182
script:
156183
- ./.gitlab/tar.sh
157184
variables:
158185
TARBALL_ARCHIVE_SUFFIX: x86_64-deb10-linux
159186
TARBALL_EXT: tar.xz
160187

161188
test-x86_64-linux-deb10:
162-
extends: .test
189+
extends:
190+
- .test
191+
- .x86_64-linux-deb10
163192
needs: ["tar-x86_64-linux-deb10"]
164-
tags:
165-
- x86_64-linux
166-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
167193
before_script:
168194
- sudo apt update
169195
- sudo apt install -y tree
@@ -173,35 +199,32 @@ test-x86_64-linux-deb10:
173199
######################
174200

175201
build-x86_64-linux-deb9:
176-
extends: .build
202+
extends:
203+
- .build
204+
- .x86_64-linux-deb9
177205
before_script:
178206
- sudo apt update
179207
- sudo apt install -y patchelf tree
180-
tags:
181-
- x86_64-linux
182-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
183208
variables:
184209
ADD_CABAL_ARGS: "--enable-split-sections"
185210

186211
tar-x86_64-linux-deb9:
187-
extends: .artifacts
212+
extends:
213+
- .artifacts
214+
- .x86_64-linux-deb9
188215
stage: tar
189216
needs: ["build-x86_64-linux-deb9"]
190-
tags:
191-
- x86_64-linux
192-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
193217
script:
194218
- ./.gitlab/tar.sh
195219
variables:
196220
TARBALL_ARCHIVE_SUFFIX: x86_64-deb9-linux
197221
TARBALL_EXT: tar.xz
198222

199223
test-x86_64-linux-deb9:
200-
extends: .test
224+
extends:
225+
- .test
226+
- .x86_64-linux-deb9
201227
needs: ["tar-x86_64-linux-deb9"]
202-
tags:
203-
- x86_64-linux
204-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
205228
before_script:
206229
- sudo apt update
207230
- sudo apt install -y tree
@@ -211,35 +234,32 @@ test-x86_64-linux-deb9:
211234
######################
212235

213236
build-x86_64-linux-centos7:
214-
extends: .build
237+
extends:
238+
- .build
239+
- .x86_64-linux-centos7
215240
before_script:
216241
- sudo yum install -y epel-release
217242
- sudo yum install -y patchelf tree
218-
tags:
219-
- x86_64-linux
220-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-centos7:$DOCKER_REV"
221243
variables:
222244
ADD_CABAL_ARGS: "--enable-split-sections"
223245

224246
tar-x86_64-linux-centos7:
225-
extends: .artifacts
247+
extends:
248+
- .artifacts
249+
- .x86_64-linux-centos7
226250
stage: tar
227251
needs: ["build-x86_64-linux-centos7"]
228-
tags:
229-
- x86_64-linux
230-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-centos7:$DOCKER_REV"
231252
script:
232253
- ./.gitlab/tar.sh
233254
variables:
234255
TARBALL_ARCHIVE_SUFFIX: x86_64-centos7-linux
235256
TARBALL_EXT: tar.xz
236257

237258
test-x86_64-linux-centos7:
238-
extends: .test
259+
extends:
260+
- .test
261+
- .x86_64-linux-centos7
239262
needs: ["tar-x86_64-linux-centos7"]
240-
tags:
241-
- x86_64-linux
242-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-centos7:$DOCKER_REV"
243263
before_script:
244264
- sudo yum install -y tree
245265

@@ -248,34 +268,31 @@ test-x86_64-linux-centos7:
248268
######################
249269

250270
build-x86_64-linux-fedora27:
251-
extends: .build
271+
extends:
272+
- .build
273+
- .x86_64-linux-fedora27
252274
before_script:
253275
- sudo dnf install -y patchelf tree
254-
tags:
255-
- x86_64-linux
256-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
257276
variables:
258277
ADD_CABAL_ARGS: "--enable-split-sections"
259278

260279
tar-x86_64-linux-fedora27:
261-
extends: .artifacts
280+
extends:
281+
- .artifacts
282+
- .x86_64-linux-fedora27
262283
stage: tar
263284
needs: ["build-x86_64-linux-fedora27"]
264-
tags:
265-
- x86_64-linux
266-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
267285
script:
268286
- ./.gitlab/tar.sh
269287
variables:
270288
TARBALL_ARCHIVE_SUFFIX: x86_64-fedora27-linux
271289
TARBALL_EXT: tar.xz
272290

273291
test-x86_64-linux-fedora27:
274-
extends: .test
292+
extends:
293+
- .test
294+
- .x86_64-linux-fedora27
275295
needs: ["tar-x86_64-linux-fedora27"]
276-
tags:
277-
- x86_64-linux
278-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
279296
before_script:
280297
- sudo dnf install -y tree
281298

@@ -285,22 +302,20 @@ test-x86_64-linux-fedora27:
285302
######################
286303

287304
build-x86_64-linux-alpine:
288-
extends: .build
289-
tags:
290-
- x86_64-linux
291-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV"
305+
extends:
306+
- .build
307+
- .x86_64-linux-alpine
292308
before_script:
293309
- sudo apk add --no-cache tar zlib zlib-dev zlib-static bzip2 bzip2-dev bzip2-static gmp gmp-dev xz xz-dev ncurses-static patchelf findutils tree
294310
variables:
295311
ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
296312

297313
tar-x86_64-linux-alpine:
298-
extends: .artifacts
314+
extends:
315+
- .artifacts
316+
- .x86_64-linux-alpine
299317
stage: tar
300318
needs: ["build-x86_64-linux-alpine"]
301-
tags:
302-
- x86_64-linux
303-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV"
304319
before_script:
305320
- sudo apk add --no-cache tar zlib zlib-dev zlib-static bzip2 bzip2-dev bzip2-static gmp gmp-dev xz xz-dev ncurses-static
306321
script:
@@ -310,11 +325,10 @@ tar-x86_64-linux-alpine:
310325
TARBALL_EXT: tar.xz
311326

312327
test-x86_64-linux-alpine:
313-
extends: .test
328+
extends:
329+
- .test
330+
- .x86_64-linux-alpine
314331
needs: ["tar-x86_64-linux-alpine"]
315-
tags:
316-
- x86_64-linux
317-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV"
318332
before_script:
319333
- sudo apk add --no-cache tar zlib zlib-dev zlib-static bzip2 bzip2-dev bzip2-static gmp gmp-dev xz xz-dev ncurses-static tree
320334

0 commit comments

Comments
 (0)