Skip to content

Commit 7722565

Browse files
authored
chore: migrate CI to circleci-toolkit 6.0.0 (#1575)
## Summary - Migrate all 4 CI files from `jerus-org/circleci-toolkit@4.9.5` to `6.0.0` - Rename `required_builds_rolling` → `required_builds` - Rename `common_tests_rolling` → `common_tests` - Remove `min_rust_version` from jobs that no longer accept it (including `rust_fuzz_smoke`, `rust_miri`, `test_wasm`) - Remove orphaned `min_rust_version` pipeline parameter from `audit.yml` 🤖 Generated with [Claude Code](https://claude.com/claude-code)
2 parents 1ed5268 + 7921d4d commit 7722565

File tree

5 files changed

+14
-27
lines changed

5 files changed

+14
-27
lines changed

.circleci/audit.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55
version: 2.1
66

77
orbs:
8-
toolkit: jerus-org/circleci-toolkit@4.9.5
9-
10-
parameters:
11-
min_rust_version:
12-
type: string
13-
default: "1.88"
8+
toolkit: jerus-org/circleci-toolkit@6.0.0
149

1510
workflows:
1611
audit:
@@ -20,7 +15,6 @@ workflows:
2015

2116
- toolkit/rust_miri:
2217
name: miri_tests
23-
min_rust_version: << pipeline.parameters.min_rust_version >>
2418
package: "hcaptcha"
2519
test_args: "--lib"
2620
skip_tests: >
@@ -35,7 +29,6 @@ workflows:
3529

3630
- toolkit/rust_fuzz_smoke:
3731
name: fuzz_smoke
38-
min_rust_version: << pipeline.parameters.min_rust_version >>
3932
fuzz_target: "response_parse"
4033
max_total_time: 60
4134
fail_on_findings: false

.circleci/config.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ parameters:
1010
default: "1.88"
1111

1212
orbs:
13-
toolkit: jerus-org/circleci-toolkit@4.9.5
13+
toolkit: jerus-org/circleci-toolkit@6.0.0
1414

1515
# Reusable command to set reproducible-build environment variables.
1616
commands:
@@ -109,22 +109,19 @@ workflows:
109109
filters:
110110
branches:
111111
only: /pull\/[0-9]+/
112-
- toolkit/required_builds_rolling:
112+
- toolkit/required_builds:
113113
min_rust_version: << pipeline.parameters.min_rust_version >>
114114
- toolkit/optional_builds:
115-
min_rust_version: << pipeline.parameters.min_rust_version >>
116115
filters:
117116
branches:
118117
ignore: main
119-
- toolkit/test_doc_build:
120-
min_rust_version: << pipeline.parameters.min_rust_version >>
118+
- toolkit/test_doc_build
121119
- toolkit/idiomatic_rust:
122-
min_rust_version: << pipeline.parameters.min_rust_version >>
123120
lint_flags: "-A deprecated"
124121
filters:
125122
branches:
126123
ignore: main
127-
- toolkit/common_tests_rolling:
124+
- toolkit/common_tests:
128125
min_rust_version: << pipeline.parameters.min_rust_version >>
129126
cargo_all_features: false
130127
cache_version: "v2"
@@ -149,7 +146,6 @@ workflows:
149146
- /pull\/[0-9]+/
150147
- main
151148
- toolkit/code_coverage:
152-
min_rust_version: << pipeline.parameters.min_rust_version >>
153149
package: hcaptcha
154150
filters:
155151
branches:
@@ -179,5 +175,5 @@ workflows:
179175
parameters:
180176
cargo_bin: [long_help, no_options, short_help, simple_captcha]
181177
- toolkit/test_wasm:
182-
min_rust_version: << pipeline.parameters.min_rust_version >>
178+
rust_version: << pipeline.parameters.min_rust_version >>
183179
wasm_test_path: crates/test-wasm

.circleci/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ parameters:
1919
description: "Override workspace v* version (empty = nextsv auto-detect)"
2020

2121
orbs:
22-
toolkit: jerus-org/circleci-toolkit@4.9.5
22+
toolkit: jerus-org/circleci-toolkit@6.0.0
2323

2424
jobs:
2525
tools:

.circleci/update_prlog.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,19 @@ parameters:
1212
description: "If true, pcu is updated from its main github branch before running."
1313

1414
orbs:
15-
toolkit: jerus-org/circleci-toolkit@4.9.5
15+
toolkit: jerus-org/circleci-toolkit@6.0.0
1616

1717
workflows:
1818
update_prlog:
1919
jobs:
2020
- toolkit/update_prlog:
2121
name: update-prlog-on-main
2222
context: [release, bot-check, pcu-app]
23-
min_rust_version: "1.88"
2423
target_branch: "main"
2524
pcu_from_merge: --from-merge
2625
update_pcu: << pipeline.parameters.update_pcu >>
2726
pcu_verbosity: "-vvv"
2827
- toolkit/label:
29-
min_rust_version: "1.88"
3028
context: pcu-app
3129
requires:
3230
- update-prlog-on-main

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)