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

Commit cd1e69c

Browse files
Merge branch 'master' of https://github.com/paritytech/polkadot into brad-issue-6735
2 parents 1674784 + 6282def commit cd1e69c

File tree

39 files changed

+1034
-710
lines changed

39 files changed

+1034
-710
lines changed

.gitlab-ci.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ default:
4848
- api_failure
4949
interruptible: true
5050

51+
.common-before-script:
52+
before_script:
53+
- !reference [.job-switcher, before_script]
54+
- !reference [.timestamp, before_script]
55+
5156
.collect-artifacts:
5257
artifacts:
5358
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
@@ -68,7 +73,6 @@ default:
6873
# they will be used if the job fails
6974
.pipeline-stopper-vars:
7075
before_script:
71-
- !reference [.job-switcher, before_script]
7276
- echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
7377
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
7478
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
@@ -86,20 +90,20 @@ default:
8690
.kubernetes-env:
8791
image: "${CI_IMAGE}"
8892
before_script:
89-
- !reference [.job-switcher, before_script]
93+
- !reference [.common-before-script, before_script]
9094
tags:
9195
- kubernetes-parity-build
9296

9397
.docker-env:
9498
image: "${CI_IMAGE}"
9599
before_script:
96-
- !reference [.job-switcher, before_script]
100+
- !reference [.common-before-script, before_script]
97101
tags:
98102
- linux-docker-vm-c2
99103

100104
.compiler-info:
101105
before_script:
102-
- !reference [.job-switcher, before_script]
106+
- !reference [.common-before-script, before_script]
103107
- rustup show
104108
- cargo --version
105109

@@ -154,7 +158,7 @@ default:
154158

155159
.build-push-image:
156160
before_script:
157-
- !reference [.job-switcher, before_script]
161+
- !reference [.common-before-script, before_script]
158162
- test -s ./artifacts/VERSION || exit 1
159163
- test -s ./artifacts/EXTRATAG || exit 1
160164
- VERSION="$(cat ./artifacts/VERSION)"
@@ -196,6 +200,10 @@ include:
196200
- scripts/ci/gitlab/pipeline/publish.yml
197201
# zombienet jobs
198202
- scripts/ci/gitlab/pipeline/zombienet.yml
203+
# timestamp handler
204+
- project: parity/infrastructure/ci_cd/shared
205+
ref: v0.1
206+
file: /common/timestamp.yml
199207

200208
#### stage: .post
201209

0 commit comments

Comments
 (0)