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

feat(#195): release-runtime takes name argument

parent 7a312b33
No related branches found
No related tags found
No related merge requests found
...@@ -191,6 +191,8 @@ tests: ...@@ -191,6 +191,8 @@ tests:
- echo $RELEASE_FILE_RAW_SPEC - echo $RELEASE_FILE_RAW_SPEC
- export RELEASE_FILE_CLIENT_SPEC=release/gdev_client-specs.yaml - export RELEASE_FILE_CLIENT_SPEC=release/gdev_client-specs.yaml
- echo $RELEASE_FILE_CLIENT_SPEC - echo $RELEASE_FILE_CLIENT_SPEC
- export CLIENT_RELEASE_NAME=$RUNTIME-$RUNTIME_VERSION-$CLIENT_VERSION
- echo $CLIENT_RELEASE_NAME
trigger_network_release: trigger_network_release:
stage: build stage: build
...@@ -412,7 +414,7 @@ create_client_release: ...@@ -412,7 +414,7 @@ create_client_release:
SRTOOL_OUTPUT: $CI_PROJECT_DIR/release/srtool_output.json SRTOOL_OUTPUT: $CI_PROJECT_DIR/release/srtool_output.json
script: script:
- *define_network_branch_vars - *define_network_branch_vars
- cargo xtask release-runtime $NETWORK_RELEASE $CI_COMMIT_BRANCH $RUNTIME_MILESTONE - cargo xtask release-runtime $CLIENT_RELEASE_NAME $NETWORK_RELEASE $CI_COMMIT_BRANCH $RUNTIME_MILESTONE
- cargo xtask create-asset-link $RUNTIME_MILESTONE ${RUNTIME}_runtime.compact.compressed.wasm https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/$RELEASE_FILE_WASM - cargo xtask create-asset-link $RUNTIME_MILESTONE ${RUNTIME}_runtime.compact.compressed.wasm https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/$RELEASE_FILE_WASM
- cargo xtask create-asset-link $RUNTIME_MILESTONE ${RUNTIME}_client-specs.yaml https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/$RELEASE_FILE_CLIENT_SPEC - cargo xtask create-asset-link $RUNTIME_MILESTONE ${RUNTIME}_client-specs.yaml https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/$RELEASE_FILE_CLIENT_SPEC
- cargo xtask create-asset-link $RUNTIME_MILESTONE ${RUNTIME}-raw.json https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/$RELEASE_FILE_RAW_SPEC - cargo xtask create-asset-link $RUNTIME_MILESTONE ${RUNTIME}-raw.json https://nodes.pages.duniter.org/-/rust/duniter-v2s/-/jobs/$CI_JOB_ID/artifacts/$RELEASE_FILE_RAW_SPEC
......
mutation CreateReleaseMutation($branch: String!, $description: String!, $milestone: String!, $links: [ReleaseAssetLinkInput!]!) { mutation CreateReleaseMutation($name: String!, $branch: String!, $description: String!, $milestone: String!, $links: [ReleaseAssetLinkInput!]!) {
releaseCreate(input: { releaseCreate(input: {
clientMutationId: "duniter-v2s-xtask" clientMutationId: "duniter-v2s-xtask"
description: $description description: $description
milestones: [$milestone] milestones: [$milestone]
name: $milestone name: $name
projectPath: "nodes/rust/duniter-v2s" projectPath: "nodes/rust/duniter-v2s"
ref: $branch ref: $branch
tagName: $milestone tagName: $name
assets: { assets: {
links: $links links: $links
} }
......
...@@ -57,6 +57,7 @@ enum DuniterXTaskCommand { ...@@ -57,6 +57,7 @@ enum DuniterXTaskCommand {
ReleaseNetwork { network: String, branch: String }, ReleaseNetwork { network: String, branch: String },
/// Release a new runtime /// Release a new runtime
ReleaseRuntime { ReleaseRuntime {
name: String,
network: String, network: String,
branch: String, branch: String,
milestone: String, milestone: String,
...@@ -106,10 +107,11 @@ async fn main() -> Result<()> { ...@@ -106,10 +107,11 @@ async fn main() -> Result<()> {
release_runtime::release_network(network, branch).await release_runtime::release_network(network, branch).await
} }
DuniterXTaskCommand::ReleaseRuntime { DuniterXTaskCommand::ReleaseRuntime {
name,
network, network,
branch, branch,
milestone, milestone,
} => release_runtime::release_runtime(network, branch, milestone).await, } => release_runtime::release_runtime(name, network, branch, milestone).await,
DuniterXTaskCommand::PrintSpec { network } => release_runtime::print_spec(network).await, DuniterXTaskCommand::PrintSpec { network } => release_runtime::print_spec(network).await,
DuniterXTaskCommand::CreateAssetLink { DuniterXTaskCommand::CreateAssetLink {
tag, tag,
......
...@@ -86,6 +86,7 @@ pub(super) async fn release_network(network: String, branch: String) -> Result<( ...@@ -86,6 +86,7 @@ pub(super) async fn release_network(network: String, branch: String) -> Result<(
} }
pub(super) async fn release_runtime( pub(super) async fn release_runtime(
name: String,
network: String, network: String,
branch: String, branch: String,
milestone: String, milestone: String,
...@@ -129,7 +130,13 @@ pub(super) async fn release_runtime( ...@@ -129,7 +130,13 @@ pub(super) async fn release_runtime(
println!("{}", release_notes); println!("{}", release_notes);
let gitlab_token = let gitlab_token =
std::env::var("GITLAB_TOKEN").with_context(|| "missing env var GITLAB_TOKEN")?; std::env::var("GITLAB_TOKEN").with_context(|| "missing env var GITLAB_TOKEN")?;
create_release::create_release(gitlab_token, branch, milestone, release_notes.to_string()) create_release::create_release(
gitlab_token,
name,
branch,
milestone,
release_notes.to_string(),
)
.await?; .await?;
Ok(()) Ok(())
......
...@@ -27,12 +27,14 @@ pub struct CreateReleaseMutation; ...@@ -27,12 +27,14 @@ pub struct CreateReleaseMutation;
pub(super) async fn create_release( pub(super) async fn create_release(
gitlab_token: String, gitlab_token: String,
name: String,
branch: String, branch: String,
milestone: String, milestone: String,
release_notes: String, release_notes: String,
) -> Result<()> { ) -> Result<()> {
// this is the important line // this is the important line
let request_body = CreateReleaseMutation::build_query(create_release_mutation::Variables { let request_body = CreateReleaseMutation::build_query(create_release_mutation::Variables {
name,
branch, branch,
description: release_notes, description: release_notes,
milestone, milestone,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment