From 87264b7b0b1624cbfb5812ce559c3c1f99f370ae Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Thu, 13 May 2021 16:13:01 +0200 Subject: [PATCH] bump spec versions in kusama, polkadot and westend again II (#3021) * bump spec versions in kusama, polkadot and westend again II * Don't build artifacts for the downstream simnet job as it's disabled now * uncomment rococo-v1 publishing job Co-authored-by: Vladimir Istyufeev --- polkadot/.gitlab-ci.yml | 72 ++++++++++++++-------------- polkadot/runtime/kusama/src/lib.rs | 2 +- polkadot/runtime/polkadot/src/lib.rs | 2 +- polkadot/runtime/westend/src/lib.rs | 2 +- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml index 52c1558b22..a839d3b897 100644 --- a/polkadot/.gitlab-ci.yml +++ b/polkadot/.gitlab-ci.yml @@ -257,19 +257,19 @@ generate-impl-guide: publish-polkadot-image: stage: build <<: *build-push-image - variables: - <<: *image-variables - # scripts/docker/Dockerfile - DOCKERFILE: Dockerfile - IMAGE_NAME: docker.io/paritypr/synth-wave +# variables: +# <<: *image-variables +# # scripts/docker/Dockerfile +# DOCKERFILE: Dockerfile +# IMAGE_NAME: docker.io/paritypr/synth-wave rules: # Don't run on releases - this is handled by the Github Action here: # .github/workflows/publish-docker-release.yml - - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 - when: never - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_REF_NAME == "master" - - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs +# - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 +# when: never +# - if: $CI_PIPELINE_SOURCE == "schedule" +# - if: $CI_COMMIT_REF_NAME == "master" +# - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs - if: $CI_COMMIT_REF_NAME == "rococo-v1" variables: <<: *image-variables @@ -280,32 +280,32 @@ publish-polkadot-image: - job: test-build-linux-stable artifacts: true -publish-adder-collator-image: - # service image for Simnet - stage: build - <<: *build-push-image - variables: - <<: *image-variables - # scripts/docker/collator.Dockerfile - DOCKERFILE: collator.Dockerfile - IMAGE_NAME: docker.io/paritypr/colander - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_REF_NAME == "master" - - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs - - if: $CI_COMMIT_REF_NAME == "rococo-v1" - needs: - - job: build-adder-collator - artifacts: true - after_script: - - buildah logout "$IMAGE_NAME" - # pass artifacts to the trigger-simnet job - - echo "COLLATOR_IMAGE=$IMAGE_NAME" > ./artifacts/collator.env - - echo "COLLATOR_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/collator.env - artifacts: - reports: - # this artifact is used in trigger-simnet job - dotenv: ./artifacts/collator.env +# publish-adder-collator-image: +# # service image for Simnet +# stage: build +# <<: *build-push-image +# variables: +# <<: *image-variables +# # scripts/docker/collator.Dockerfile +# DOCKERFILE: collator.Dockerfile +# IMAGE_NAME: docker.io/paritypr/colander +# rules: +# - if: $CI_PIPELINE_SOURCE == "schedule" +# - if: $CI_COMMIT_REF_NAME == "master" +# - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs +# - if: $CI_COMMIT_REF_NAME == "rococo-v1" +# needs: +# - job: build-adder-collator +# artifacts: true +# after_script: +# - buildah logout "$IMAGE_NAME" +# # pass artifacts to the trigger-simnet job +# - echo "COLLATOR_IMAGE=$IMAGE_NAME" > ./artifacts/collator.env +# - echo "COLLATOR_IMAGE_TAG=$(cat ./artifacts/EXTRATAG)" >> ./artifacts/collator.env +# artifacts: +# reports: +# # this artifact is used in trigger-simnet job +# dotenv: ./artifacts/collator.env #### stage: publish diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index 512de14f67..4ccb4d5118 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -119,7 +119,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kusama"), impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, - spec_version: 9010, + spec_version: 9011, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index 21a0131109..c6a76815f8 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -95,7 +95,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("polkadot"), impl_name: create_runtime_str!("parity-polkadot"), authoring_version: 0, - spec_version: 9010, + spec_version: 9011, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index 4d1414cb8b..77f84bb5dc 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -118,7 +118,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("westend"), impl_name: create_runtime_str!("parity-westend"), authoring_version: 2, - spec_version: 9010, + spec_version: 9011, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS,