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

Commit

Permalink
Merge branch 'master' into davxy-companion-for-13615
Browse files Browse the repository at this point in the history
  • Loading branch information
davxy committed Mar 17, 2023
2 parents f663d6c + b1dbd3c commit 370cddb
Show file tree
Hide file tree
Showing 45 changed files with 656 additions and 447 deletions.
18 changes: 13 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ default:
- api_failure
interruptible: true

.common-before-script:
before_script:
- !reference [.job-switcher, before_script]
- !reference [.timestamp, before_script]

.collect-artifacts:
artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
Expand All @@ -68,7 +73,6 @@ default:
# they will be used if the job fails
.pipeline-stopper-vars:
before_script:
- !reference [.job-switcher, before_script]
- echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
Expand All @@ -86,20 +90,20 @@ default:
.kubernetes-env:
image: "${CI_IMAGE}"
before_script:
- !reference [.job-switcher, before_script]
- !reference [.common-before-script, before_script]
tags:
- kubernetes-parity-build

.docker-env:
image: "${CI_IMAGE}"
before_script:
- !reference [.job-switcher, before_script]
- !reference [.common-before-script, before_script]
tags:
- linux-docker-vm-c2

.compiler-info:
before_script:
- !reference [.job-switcher, before_script]
- !reference [.common-before-script, before_script]
- rustup show
- cargo --version

Expand Down Expand Up @@ -154,7 +158,7 @@ default:

.build-push-image:
before_script:
- !reference [.job-switcher, before_script]
- !reference [.common-before-script, before_script]
- test -s ./artifacts/VERSION || exit 1
- test -s ./artifacts/EXTRATAG || exit 1
- VERSION="$(cat ./artifacts/VERSION)"
Expand Down Expand Up @@ -196,6 +200,10 @@ include:
- scripts/ci/gitlab/pipeline/publish.yml
# zombienet jobs
- scripts/ci/gitlab/pipeline/zombienet.yml
# timestamp handler
- project: parity/infrastructure/ci_cd/shared
ref: v0.1
file: /common/timestamp.yml

#### stage: .post

Expand Down
Loading

0 comments on commit 370cddb

Please sign in to comment.