From c124d0ef0eca796df769ccb55a6c47c1d6ef8f87 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Wed, 29 Nov 2023 22:11:06 +0100
Subject: [PATCH] fix: hardcoded branch name runtime-700
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d776610f8..65b33427e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -192,7 +192,7 @@ readme_docker_release_tag:
SRTOOL_OUTPUT: $CI_PROJECT_DIR/release/srtool_output_$RUNTIME.json
script:
- echo "Building runtime for $RUNTIME"
- - echo release/runtime-700 | sed -e "s/release\///g"
+ - echo $CI_COMMIT_BRANCH | sed -e "s/release\///g"
- mkdir -p $CI_PROJECT_DIR/release
# Copy sources to the expected directory of srtool
- cp -R * /build/
@@ -320,7 +320,7 @@ create_release:
SRTOOL_OUTPUT_G1: $CI_PROJECT_DIR/release/srtool_output_g1.json
script:
# Release creation
- - export MILESTONE=$(echo release/runtime-700 | sed -e "s/release\///g")
+ - export MILESTONE=$(echo $CI_COMMIT_BRANCH | sed -e "s/release\///g")
- cargo xtask release-runtime $MILESTONE $CI_COMMIT_BRANCH
# We always ship runtimes: this is both a proof and a convenience
- cargo xtask create-asset-link $MILESTONE g1-data.json https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/release/g1-data.json
@@ -344,7 +344,7 @@ create_release:
- if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/
image: rust:1-bullseye
script:
- - export MILESTONE=$(echo release/runtime-700 | sed -e "s/release\///g")
+ - export MILESTONE=$(echo $CI_COMMIT_BRANCH | sed -e "s/release\///g")
- cargo xtask create-asset-link $MILESTONE ${RUNTIME}.json https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/release/${RUNTIME}.json
- cargo xtask create-asset-link $MILESTONE ${RUNTIME}-raw.json https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/release/${RUNTIME}-raw.json
- echo "Release Docker file..."
--
GitLab