Skip to content
Snippets Groups Projects
Commit dcfd6c75 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

Merge branch 'release/runtime-600'

# Conflicts:
#	resources/metadata.scale
#	runtime/gdev/src/lib.rs
parents b7d0b525 55db01d2
No related branches found
No related tags found
No related merge requests found
Pipeline #34071 waiting for manual action
......@@ -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
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment