From 4bf6f6f843e0431fd1f1897b1c1b808e1236e143 Mon Sep 17 00:00:00 2001 From: Jeremiah Russell Date: Fri, 10 Jan 2025 11:14:38 +0000 Subject: [PATCH 1/4] ci(circleci): add release-flag parameter and update job names --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dcd1df0..d303fe9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,10 @@ parameters: type: boolean default: false description: "If true, the success pipeline will be executed." + release-flag: + type: boolean + default: false + description: "If true, the release pipeline will be executed." orbs: toolkit: jerus-org/circleci-toolkit@2.0.0 @@ -74,7 +78,7 @@ jobs: - make-test: zola-version: << parameters.zola-version >> - publish_rustc_version: + publish_zola_version: parameters: zola-version: type: string @@ -122,9 +126,7 @@ workflows: filters: branches: ignore: main - matrix: &matrix - parameters: - zola-version: ["0.19.2"] + zola-version: << pipeline.parameters.zola-version >> - toolkit/update_changelog: requires: - test @@ -166,9 +168,11 @@ workflows: - not: << pipeline.parameters.success-flag >> - not: << pipeline.parameters.validation-flag >> jobs: + - publish_zola_version: + zola-version: << pipeline.parameters.zola-version >> - toolkit/make_release: requires: - - publish_rustc_version + - publish_zola_version context: - release - bot-check @@ -176,7 +180,3 @@ workflows: min_rust_version: "1.81" when_cargo_release: false pcu_update_changelog: true - pcu_verbosity: "-vvvv" - - publish_rustc_version: - matrix: - <<: *matrix From 5c04478c3c14677d88adbbac9d2a42d78903b1de Mon Sep 17 00:00:00 2001 From: Jerus Bot <171541392+jerus-bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 11:16:40 +0000 Subject: [PATCH 2/4] chore: update changelog for pr --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a62082..d1a7f6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Configure Renovate(pr [#1]) +- ci(circleci)-add release-flag parameter and update job names(pr [#7]) ### Security @@ -22,3 +23,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2]: https://github.com/jerus-org/zola-container/pull/2 [#1]: https://github.com/jerus-org/zola-container/pull/1 [#5]: https://github.com/jerus-org/zola-container/pull/5 +[#7]: https://github.com/jerus-org/zola-container/pull/7 From e459f8a0bf2a64ccd6c8cca451d312649af6ef29 Mon Sep 17 00:00:00 2001 From: Jeremiah Russell Date: Fri, 10 Jan 2025 11:18:15 +0000 Subject: [PATCH 3/4] ci: update CircleCI config to include release flag in workflows --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d303fe9..55c82c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,6 +98,7 @@ workflows: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - not: << pipeline.parameters.success-flag >> - not: << pipeline.parameters.validation-flag >> + - not: << pipeline.parameters.release-flag >> jobs: - toolkit/choose_pipeline: @@ -114,6 +115,7 @@ workflows: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - not: << pipeline.parameters.success-flag >> - << pipeline.parameters.validation-flag >> + - not: << pipeline.parameters.release-flag >> jobs: - toolkit/label: min_rust_version: "1.81" @@ -143,6 +145,7 @@ workflows: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - << pipeline.parameters.success-flag >> - not: << pipeline.parameters.validation-flag >> + - not: << pipeline.parameters.release-flag >> jobs: - toolkit/end_success @@ -163,10 +166,9 @@ workflows: release: when: and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: ["release check", << pipeline.schedule.name >>] - not: << pipeline.parameters.success-flag >> - not: << pipeline.parameters.validation-flag >> + - << pipeline.parameters.release-flag >> jobs: - publish_zola_version: zola-version: << pipeline.parameters.zola-version >> From 7428d5788e536991b33fd6d3138c5585d0998b57 Mon Sep 17 00:00:00 2001 From: Jeremiah Russell Date: Fri, 10 Jan 2025 11:44:52 +0000 Subject: [PATCH 4/4] ci: add SEMVER environment variable to make_release job in CircleCI config --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 55c82c6..cd9b947 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -173,6 +173,8 @@ workflows: - publish_zola_version: zola-version: << pipeline.parameters.zola-version >> - toolkit/make_release: + env: + - SEMVER=<< pipeline.parameters.zola-version >> requires: - publish_zola_version context: