Skip to content

Commit 8089a4c

Browse files
committed
ci: fix for $CI_PARALLEL
1 parent d8a912c commit 8089a4c

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ build:merge:
140140

141141
build:platforms-generate:
142142
stage: build
143+
needs: []
143144
script:
144145
- mkdir -p ./tmp
145146
- >
@@ -195,6 +196,7 @@ build:prerelease:
195196
stage: build
196197
needs:
197198
- build:dist
199+
- build:platforms
198200
# Don't interrupt publishing job
199201
interruptible: false
200202
before_script:
@@ -218,6 +220,7 @@ integration:builds:
218220
stage: integration
219221
needs:
220222
- build:dist
223+
- build:platforms
221224
script:
222225
- mkdir -p ./builds
223226
- >
@@ -416,6 +419,8 @@ integration:merge:
416419
- build:merge
417420
- job: build:dist
418421
optional: true
422+
- job: build:platforms
423+
optional: true
419424
- job: integration:nix
420425
optional: true
421426
- job: integration:docker
@@ -491,6 +496,7 @@ release:distribution:
491496
stage: release
492497
needs:
493498
- build:dist
499+
- build:platforms
494500
- integration:builds
495501
- integration:merge
496502
- release:deployment:tag

scripts/build-pipelines.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,15 @@ printf "\n"
4949
# Number of parallel shards to split the test suite into
5050
CI_PARALLEL=2
5151

52-
5352
cat << "EOF"
5453
build:linux:
5554
stage: build
5655
needs: []
56+
EOF
57+
cat << EOF
5758
parallel: $CI_PARALLEL
59+
EOF
60+
cat << "EOF"
5861
script:
5962
- >
6063
nix-shell --run '
@@ -78,7 +81,11 @@ cat << "EOF"
7881
build:windows:
7982
stage: build
8083
needs: []
84+
EOF
85+
cat << EOF
8186
parallel: $CI_PARALLEL
87+
EOF
88+
cat << "EOF"
8289
tags:
8390
- windows
8491
before_script:
@@ -103,7 +110,11 @@ cat << "EOF"
103110
build:macos:
104111
stage: build
105112
needs: []
113+
EOF
114+
cat << EOF
106115
parallel: $CI_PARALLEL
116+
EOF
117+
cat << "EOF"
107118
tags:
108119
- shared-macos-amd64
109120
image: macos-11-xcode-12

scripts/test-pipelines.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ cat << "EOF"
4949
check:test:
5050
stage: check
5151
needs: []
52+
EOF
53+
cat << EOF
5254
parallel: $CI_PARALLEL
55+
EOF
56+
cat << "EOF"
5357
script:
5458
- >
5559
nix-shell --run '

0 commit comments

Comments
 (0)