diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e1f503d54b87ebfdb402cd4aed693865d58be4f..2e4b04ffb7784661bf03475c92e232c4a5d842b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,14 +108,25 @@ build_debug: build_release: extends: .docker_build rules: - - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "master"' + - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/" + when: never - when: manual variables: IMAGE_NAME: "duniter/duniter-v2s" IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA" PODMAN_BUILD_OPTIONS: "--platform linux/amd64" +build_release_tag: + extends: .docker_build + rules: + - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/" + - when: never + variables: + IMAGE_NAME: "duniter/duniter-v2s" + IMAGE_TAG: "$CI_COMMIT_TAG" + PODMAN_BUILD_OPTIONS: "--platform linux/amd64" + test_debug: stage: tests extends: .docker_build @@ -135,7 +146,7 @@ test_release: stage: tests extends: .docker_build rules: - - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" + - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/" - when: never variables: IMAGE_NAME: "duniter/duniter-v2s-test" @@ -180,7 +191,7 @@ deploy_docker_release_tag: stage: deploy extends: .docker_deploy_native rules: - - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" + - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/" - when: never variables: IMAGE_NAME: "duniter/duniter-v2s" @@ -191,7 +202,7 @@ deploy_docker_release_tag_multiplatform: needs: ["deploy_docker_release_tag"] extends: .docker_deploy_multiplatform rules: - - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" + - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/" - when: never script: - !reference [.docker_deploy_multiplatform, script] @@ -204,7 +215,7 @@ readme_docker_release_tag: stage: deploy_readme needs: ["deploy_docker_release_tag"] rules: - - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" + - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^(v|runtime-)[0-9].*/" - when: never image: name: chko/docker-pushrm diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs index 11d4afe1e674abee1cdd6d6881fd5921e2c6ad8f..57681a89409ff30ced0208f9d27435758dba458b 100644 --- a/runtime/g1/src/lib.rs +++ b/runtime/g1/src/lib.rs @@ -86,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // `spec_version`, and `authoring_version` are the same between Wasm and native. // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use // the compatible custom types. - spec_version: 400, + spec_version: 600, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs index 8e60afe019ababc2081bfb00ddbde58640016c6b..fd22c7bf6cd163e6a3aa3abffe3f448bc1c9e916 100644 --- a/runtime/gdev/src/lib.rs +++ b/runtime/gdev/src/lib.rs @@ -93,7 +93,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // `spec_version`, and `authoring_version` are the same between Wasm and native. // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use // the compatible custom types. - spec_version: 500, + spec_version: 600, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs index b04fd581e584dbdf2520225bca46cc18eebcb88f..4d3b0e4a0d5abfe9da06233e1c2d8d986c3f2e99 100644 --- a/runtime/gtest/src/lib.rs +++ b/runtime/gtest/src/lib.rs @@ -90,7 +90,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // `spec_version`, and `authoring_version` are the same between Wasm and native. // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use // the compatible custom types. - spec_version: 400, + spec_version: 600, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1,