From 7f2926496711b4b32d1b34e1a3f236ca03e74bce Mon Sep 17 00:00:00 2001 From: Jeremiah Russell Date: Mon, 12 Jan 2026 07:54:42 +0000 Subject: [PATCH 1/2] feat!: migrate to circleci-toolkit v4.2.1 - Update orb version from 2.13.5 to 4.2.1 - Remove custom executors Co-Authored-By: Claude Opus 4.5 Signed-off-by: Jeremiah Russell --- .circleci/config.yml | 61 +++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54445e9..ec30555 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,32 +1,29 @@ version: 2.1 parameters: - min-rust-version: + min_rust_version: type: string default: "1.82" fingerprint: type: string default: SHA256:OkxsH8Z6Iim6WDJBaII9eTT9aaO1f3eDc6IpsgYYPVg - validation-flag: + validation_flag: type: boolean default: false description: "If true, the validation pipeline will be executed." - success-flag: + success_flag: type: boolean default: false description: "If true, the success pipeline will be executed." - release-flag: + release_flag: type: boolean default: false description: "If true, the success pipeline will be executed." orbs: - toolkit: jerus-org/circleci-toolkit@3.2.0 + toolkit: jerus-org/circleci-toolkit@4.2.1 -executors: - rust-env: - docker: - - image: jerusdp/ci-rust:<> +# Custom executors removed - using toolkit rolling executors instead workflows: check_last_commit: @@ -34,9 +31,9 @@ workflows: and: - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - not: << pipeline.parameters.success-flag >> - - not: << pipeline.parameters.validation-flag >> - - not: << pipeline.parameters.release-flag >> + - not: << pipeline.parameters.success_flag >> + - not: << pipeline.parameters.validation_flag >> + - not: << pipeline.parameters.release_flag >> jobs: - toolkit/choose_pipeline: @@ -48,29 +45,29 @@ workflows: and: - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - not: << pipeline.parameters.success-flag >> - - << pipeline.parameters.validation-flag >> - - not: << pipeline.parameters.release-flag >> + - not: << pipeline.parameters.success_flag >> + - << pipeline.parameters.validation_flag >> + - not: << pipeline.parameters.release_flag >> jobs: - toolkit/label: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> context: pcu-app filters: branches: only: - main - toolkit/code_coverage: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> - toolkit/required_builds: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> - toolkit/test_doc_build: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> - toolkit/optional_builds: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> - toolkit/common_tests: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> - toolkit/idiomatic_rust: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> - toolkit/update_prlog: requires: - toolkit/required_builds @@ -81,16 +78,16 @@ workflows: - release - bot-check ssh_fingerprint: << pipeline.parameters.fingerprint >> - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> on_success: when: and: - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - << pipeline.parameters.success-flag >> - - not: << pipeline.parameters.validation-flag >> - - not: << pipeline.parameters.release-flag >> + - << pipeline.parameters.success_flag >> + - not: << pipeline.parameters.validation_flag >> + - not: << pipeline.parameters.release_flag >> jobs: - toolkit/end_success @@ -102,12 +99,12 @@ workflows: - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - equal: ["release check", << pipeline.schedule.name >>] - and: - - not: << pipeline.parameters.success-flag >> - - not: << pipeline.parameters.validation-flag >> - - << pipeline.parameters.release-flag >> + - not: << pipeline.parameters.success_flag >> + - not: << pipeline.parameters.validation_flag >> + - << pipeline.parameters.release_flag >> jobs: - toolkit/save_next_version: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> - toolkit/make_release: context: @@ -126,11 +123,11 @@ workflows: echo $SEMVER echo "export SEMVER=$SEMVER" >> "$BASH_ENV" ssh_fingerprint: << pipeline.parameters.fingerprint >> - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> when_use_workspace: false - toolkit/no_release: - min_rust_version: << pipeline.parameters.min-rust-version >> + min_rust_version: << pipeline.parameters.min_rust_version >> requires: - toolkit/save_next_version: - failed From 3521f965243ef90cfcf3664d5538ea0d79021406 Mon Sep 17 00:00:00 2001 From: Jerus Bot <171541392+jerus-bot@users.noreply.github.com> Date: Mon, 12 Jan 2026 07:57:36 +0000 Subject: [PATCH 2/2] chore: update prlog for pr Signed-off-by: Jerus Bot <171541392+jerus-bot@users.noreply.github.com> --- PRLOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PRLOG.md b/PRLOG.md index 764b842..c1df31b 100644 --- a/PRLOG.md +++ b/PRLOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- BREAKING: migrate to circleci-toolkit v4.2.1(pr [#125]) + ### Fixed - deps: update dependency toolkit to v3(pr [#124]) @@ -415,6 +419,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#124]: https://github.com/jerus-org/lambda_sqs/pull/124 [#121]: https://github.com/jerus-org/lambda_sqs/pull/121 [#122]: https://github.com/jerus-org/lambda_sqs/pull/122 +[#125]: https://github.com/jerus-org/lambda_sqs/pull/125 [Unreleased]: https://github.com/jerus-org/lambda_sqs/compare/v0.2.37...HEAD [0.2.37]: https://github.com/jerus-org/lambda_sqs/compare/v0.2.36...v0.2.37 [0.2.36]: https://github.com/jerus-org/lambda_sqs/compare/v0.2.35...v0.2.36