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

Commit

Permalink
Merge remote-tracking branch 'origin/master' into kiz-election-provid…
Browse files Browse the repository at this point in the history 
…er-3-signed-phase
  • Loading branch information
@coriolinus
coriolinus committed Jun 18, 2021
2 parents ce0974f + f6b1197 commit c1a4f1e
Show file tree
Hide file tree
Showing 452 changed files with 18,152 additions and 5,688 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ version: 2
updates:
- package-ecosystem: "cargo"
directory: "/"
labels: ["A2-insubstantial", "B0-silent", "C1-low"]
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
schedule:
interval: "daily"
38 changes: 22 additions & 16 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,16 @@ default:
paths:
- artifacts/

.kubernetes-build: &kubernetes-build
.kubernetes-env: &kubernetes-env
tags:
- kubernetes-parity-build
interruptible: true

.rust-info-script: &rust-info-script
- rustup show
- cargo --version
- rustup +nightly show
- cargo +nightly --version
- sccache -s

.docker-env: &docker-env
Expand Down Expand Up @@ -140,7 +142,7 @@ default:

skip-if-draft:
image: paritytech/tools:latest
<<: *kubernetes-build
<<: *kubernetes-env
stage: .pre
rules:
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
Expand All @@ -155,7 +157,7 @@ skip-if-draft:
check-runtime:
stage: check
image: paritytech/tools:latest
<<: *kubernetes-build
<<: *kubernetes-env
rules:
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
variables:
Expand All @@ -169,7 +171,7 @@ check-runtime:
check-signed-tag:
stage: check
image: paritytech/tools:latest
<<: *kubernetes-build
<<: *kubernetes-env
rules:
- if: $CI_COMMIT_REF_NAME =~ /^ci-release-.*$/
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
Expand All @@ -179,7 +181,7 @@ check-signed-tag:
check-line-width:
stage: check
image: paritytech/tools:latest
<<: *kubernetes-build
<<: *kubernetes-env
rules:
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
script:
Expand All @@ -189,7 +191,7 @@ check-line-width:
test-dependency-rules:
stage: check
image: paritytech/tools:latest
<<: *kubernetes-build
<<: *kubernetes-env
rules:
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
script:
Expand All @@ -198,7 +200,7 @@ test-dependency-rules:
test-prometheus-alerting-rules:
stage: check
image: paritytech/tools:latest
<<: *kubernetes-build
<<: *kubernetes-env
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
Expand Down Expand Up @@ -317,7 +319,7 @@ test-linux-stable: &test-linux
script:
# this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests
- time cargo test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml
- time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml # does not reuse cache 1 min 44 sec
- time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
- SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
- sccache -s

Expand Down Expand Up @@ -353,6 +355,7 @@ test-frame-examples-compile-to-wasm:

test-linux-stable-int:
<<: *test-linux
stage: test
script:
- echo "___Logs will be partly shown at the end in case of failure.___"
- echo "___Full log will be saved to the job artifacts only in case of failure.___"
Expand Down Expand Up @@ -419,7 +422,7 @@ cargo-check-macos:
check-polkadot-companion-status:
stage: build
image: paritytech/tools:latest
<<: *kubernetes-build
<<: *kubernetes-env
rules:
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
script:
Expand Down Expand Up @@ -536,7 +539,7 @@ build-rust-doc:

.build-push-docker-image: &build-push-docker-image
<<: *build-refs
<<: *kubernetes-build
<<: *kubernetes-env
image: quay.io/buildah/stable
variables: &docker-build-vars
<<: *default-vars
Expand Down Expand Up @@ -565,9 +568,11 @@ build-rust-doc:
- buildah push --format=v2s2 "$IMAGE_NAME:latest"
after_script:
- buildah logout "$IMAGE_NAME"
# pass artifacts to the trigger-simnet job
- echo "IMAGE_NAME=${IMAGE_NAME}" > ./artifacts/$PRODUCT/build.env
- echo "IMAGE_TAG=${VERSION}" >> ./artifacts/$PRODUCT/build.env
# pass artifacts to the trigger-simnet job
- echo "IMAGE_NAME=${IMAGE_NAME}" | tee -a ./artifacts/$PRODUCT/build.env
- IMAGE_TAG="$(cat ./artifacts/$PRODUCT/VERSION)"
- echo "IMAGE_TAG=${IMAGE_TAG}" | tee -a ./artifacts/$PRODUCT/build.env
- cat ./artifacts/$PRODUCT/build.env

publish-docker-substrate:
stage: publish
Expand Down Expand Up @@ -598,7 +603,7 @@ publish-docker-subkey:
publish-s3-release:
stage: publish
<<: *build-refs
<<: *kubernetes-build
<<: *kubernetes-env
needs:
- job: build-linux-substrate
artifacts: true
Expand Down Expand Up @@ -627,7 +632,7 @@ publish-s3-doc:
- job: build-linux-substrate
artifacts: false
<<: *build-refs
<<: *kubernetes-build
<<: *kubernetes-env
variables:
GIT_STRATEGY: none
BUCKET: "releases.parity.io"
Expand Down Expand Up @@ -689,6 +694,7 @@ deploy-prometheus-alerting-rules:
trigger-simnet:
stage: deploy
image: paritytech/tools:latest
<<: *kubernetes-env
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
Expand All @@ -705,4 +711,4 @@ trigger-simnet:
DWNSTRM_ID: 332
script:
# API trigger for a simnet job
- ./scripts/gitlab/trigger_pipeline.sh
- .maintain/gitlab/trigger_pipeline.sh --simnet-version=${SIMNET_REF}
8 changes: 4 additions & 4 deletions .maintain/gitlab/check_runtime.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ fi
# consensus-critical logic that has changed. the runtime wasm blobs must be
# rebuilt.

add_spec_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
add_spec_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
| sed -n -r "s/^\+[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
sub_spec_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
sub_spec_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
| sed -n -r "s/^\-[[:space:]]+spec_version: +([0-9]+),$/\1/p")"


Expand All @@ -79,9 +79,9 @@ else
# check for impl_version updates: if only the impl versions changed, we assume
# there is no consensus-critical logic that has changed.

add_impl_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
add_impl_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
| sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
sub_impl_version="$(git diff "tags/release...${CI_COMMIT_SHA}" "${VERSIONS_FILE}" \
sub_impl_version="$(git diff tags/release ${CI_COMMIT_SHA} -- "${VERSIONS_FILE}" \
| sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p')"


Expand Down
Loading

0 comments on commit c1a4f1e

Please sign in to comment.