Skip to content

Commit af81061

Browse files
authored
fix(deps): update dependency toolkit to v4 (#1504)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [toolkit](https://circleci.com/developer/orbs/orb/jerus-org/circleci-toolkit) ([source](https://redirect.github.com/jerus-org/circleci-toolkit)) | orb | major | `3.4.1` → `4.0.1` | | [toolkit](https://circleci.com/developer/orbs/orb/jerus-org/circleci-toolkit) ([source](https://redirect.github.com/jerus-org/circleci-toolkit)) | orb | major | `3.6.0` → `4.0.1` | --- ### Configuration 📅 **Schedule**: Branch creation - Between 12:00 AM and 05:59 AM, on day 24 of the month ( * 0-5 24 * * ) (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/jerus-org/hcaptcha-rs). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi42OS4xIiwidXBkYXRlZEluVmVyIjoiNDIuNjkuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
2 parents 6e91b9c + 4ebeb08 commit af81061

File tree

6 files changed

+594
-40
lines changed

6 files changed

+594
-40
lines changed

.circleci/audit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
version: 2.1
66

77
orbs:
8-
toolkit: jerus-org/circleci-toolkit@3.4.1
8+
toolkit: jerus-org/circleci-toolkit@4.0.1
99

1010
parameters:
11-
min-rust-version:
11+
min_rust_version:
1212
type: string
1313
default: "1.88"
1414

@@ -20,7 +20,7 @@ workflows:
2020

2121
- toolkit/rust_miri:
2222
name: miri_tests
23-
min_rust_version: << pipeline.parameters.min-rust-version >>
23+
min_rust_version: << pipeline.parameters.min_rust_version >>
2424
package: "hcaptcha"
2525
test_args: "--lib"
2626
skip_tests: >
@@ -35,7 +35,7 @@ workflows:
3535

3636
- toolkit/rust_fuzz_smoke:
3737
name: fuzz_smoke
38-
min_rust_version: << pipeline.parameters.min-rust-version >>
38+
min_rust_version: << pipeline.parameters.min_rust_version >>
3939
fuzz_target: "response_parse"
4040
max_total_time: 60
4141
fail_on_findings: false

.circleci/audit.yml.backup

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-FileCopyrightText: 2022 jerusdp
2+
#
3+
# SPDX-License-Identifier: MIT OR Apache-2.0
4+
5+
version: 2.1
6+
7+
orbs:
8+
toolkit: jerus-org/[email protected]
9+
10+
parameters:
11+
min-rust-version:
12+
type: string
13+
default: "1.88"
14+
15+
workflows:
16+
audit:
17+
jobs:
18+
- toolkit/security:
19+
sonarcloud: false
20+
21+
- toolkit/rust_miri:
22+
name: miri_tests
23+
min_rust_version: << pipeline.parameters.min-rust-version >>
24+
package: "hcaptcha"
25+
test_args: "--lib"
26+
skip_tests: >
27+
hcaptcha_mock_verify
28+
hcaptcha_mock_verify_request_reuse
29+
hcaptcha_mock_verify_not_found
30+
hcaptcha_mock_verify_client_response
31+
hcaptcha_mock_verify_client_response_not_found
32+
hcaptcha_mock_with_remoteip
33+
hcaptcha_mock_with_sitekey
34+
miri_flags: "-Zmiri-disable-isolation"
35+
36+
- toolkit/rust_fuzz_smoke:
37+
name: fuzz_smoke
38+
min_rust_version: << pipeline.parameters.min-rust-version >>
39+
fuzz_target: "response_parse"
40+
max_total_time: 60
41+
fail_on_findings: false

.circleci/config.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
version: 2.1
66

77
parameters:
8-
min-rust-version:
8+
min_rust_version:
99
type: string
1010
default: "1.88"
1111
fingerprint:
1212
type: string
1313
default: SHA256:OkxsH8Z6Iim6WDJBaII9eTT9aaO1f3eDc6IpsgYYPVg
14-
validation-flag:
14+
validation_flag:
1515
type: boolean
1616
default: false
1717
description: "If true, the validation pipeline will be executed."
18-
success-flag:
18+
success_flag:
1919
type: boolean
2020
default: false
2121
description: "If true, the success pipeline will be executed."
22-
release-flag:
22+
release_flag:
2323
type: boolean
2424
default: false
2525
description: "If true, the release pipeline will be executed."
@@ -40,7 +40,7 @@ parameters:
4040
description: "Optional flag to allows successful exit if no pull request in CI environment"
4141

4242
orbs:
43-
toolkit: jerus-org/circleci-toolkit@3.6.0
43+
toolkit: jerus-org/circleci-toolkit@4.0.1
4444

4545
# Reusable command to set reproducible-build environment variables.
4646
commands:
@@ -181,7 +181,7 @@ jobs:
181181
--data '{
182182
"branch": "'"${CIRCLE_BRANCH}"'",
183183
"parameters": {
184-
"success-flag": true
184+
"success_flag": true
185185
}
186186
}' \
187187
"https://circleci.com/api/v2/project/gh/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pipeline"
@@ -192,18 +192,18 @@ workflows:
192192
and:
193193
- not:
194194
equal: [scheduled_pipeline, << pipeline.trigger_source >>]
195-
- not: << pipeline.parameters.success-flag >>
196-
- not: << pipeline.parameters.release-flag >>
195+
- not: << pipeline.parameters.success_flag >>
196+
- not: << pipeline.parameters.release_flag >>
197197
jobs:
198198
- toolkit/label:
199-
min_rust_version: << pipeline.parameters.min-rust-version >>
199+
min_rust_version: << pipeline.parameters.min_rust_version >>
200200
context: pcu-app
201201
filters:
202202
branches:
203203
only:
204204
- main
205205
- toolkit/code_coverage:
206-
min_rust_version: << pipeline.parameters.min-rust-version >>
206+
min_rust_version: << pipeline.parameters.min_rust_version >>
207207
package: hcaptcha
208208
filters:
209209
branches:
@@ -212,7 +212,7 @@ workflows:
212212
- security with sonarcloud
213213
- toolkit/required_builds:
214214
name: required builds-<< matrix.cargo_package >>
215-
min_rust_version: << pipeline.parameters.min-rust-version >>
215+
min_rust_version: << pipeline.parameters.min_rust_version >>
216216
matrix: &builds
217217
parameters:
218218
cargo_package:
@@ -221,25 +221,25 @@ workflows:
221221
- security audit only
222222
- toolkit/optional_builds:
223223
name: optional builds-<< matrix.cargo_package >>
224-
min_rust_version: << pipeline.parameters.min-rust-version >>
224+
min_rust_version: << pipeline.parameters.min_rust_version >>
225225
matrix:
226226
<<: *builds
227227
requires:
228228
- security audit only
229229
- toolkit/common_tests:
230230
name: common tests for x86_64-<< matrix.cargo_package >>
231-
min_rust_version: << pipeline.parameters.min-rust-version >>
231+
min_rust_version: << pipeline.parameters.min_rust_version >>
232232
matrix:
233233
<<: *builds
234234
requires:
235235
- security audit only
236236
- toolkit/idiomatic_rust:
237-
min_rust_version: << pipeline.parameters.min-rust-version >>
237+
min_rust_version: << pipeline.parameters.min_rust_version >>
238238
lint_flags: "-A deprecated"
239239
requires:
240240
- security audit only
241241
- toolkit/test_doc_build:
242-
min_rust_version: << pipeline.parameters.min-rust-version >>
242+
min_rust_version: << pipeline.parameters.min_rust_version >>
243243
- doc_tests:
244244
requires:
245245
- toolkit/test_doc_build
@@ -273,7 +273,7 @@ workflows:
273273
- toolkit/test_doc_build
274274

275275
- toolkit/test_wasm:
276-
min_rust_version: << pipeline.parameters.min-rust-version >>
276+
min_rust_version: << pipeline.parameters.min_rust_version >>
277277
requires:
278278
- toolkit/common_tests
279279
- toolkit/required_builds
@@ -316,9 +316,9 @@ workflows:
316316
and:
317317
- not:
318318
equal: [scheduled_pipeline, << pipeline.trigger_source >>]
319-
- << pipeline.parameters.success-flag >>
320-
- not: << pipeline.parameters.validation-flag >>
321-
- not: << pipeline.parameters.release-flag >>
319+
- << pipeline.parameters.success_flag >>
320+
- not: << pipeline.parameters.validation_flag >>
321+
- not: << pipeline.parameters.release_flag >>
322322

323323
jobs:
324324
- toolkit/end_success:
@@ -331,9 +331,9 @@ workflows:
331331
and:
332332
- not:
333333
equal: [scheduled_pipeline, << pipeline.trigger_source >>]
334-
- not: << pipeline.parameters.success-flag >>
335-
- not: << pipeline.parameters.validation-flag >>
336-
- not: << pipeline.parameters.release-flag >>
334+
- not: << pipeline.parameters.success_flag >>
335+
- not: << pipeline.parameters.validation_flag >>
336+
- not: << pipeline.parameters.release_flag >>
337337

338338
jobs:
339339
- toolkit/update_prlog:
@@ -342,7 +342,7 @@ workflows:
342342
- bot-check
343343
- pcu-app
344344
ssh_fingerprint: << pipeline.parameters.fingerprint >>
345-
min_rust_version: << pipeline.parameters.min-rust-version >>
345+
min_rust_version: << pipeline.parameters.min_rust_version >>
346346
pcu_verbosity: << pipeline.parameters.pcu_verbosity >>
347347
pcu_allow_no_pull_request: << pipeline.parameters.pcu_allow_no_pull_request >>
348348
update_pcu: true
@@ -356,17 +356,17 @@ workflows:
356356
when:
357357
or:
358358
- and:
359-
- << pipeline.parameters.release-flag >>
360-
- not: << pipeline.parameters.success-flag >>
361-
- not: << pipeline.parameters.validation-flag >>
359+
- << pipeline.parameters.release_flag >>
360+
- not: << pipeline.parameters.success_flag >>
361+
- not: << pipeline.parameters.validation_flag >>
362362
- and:
363363
- equal: [scheduled_pipeline, << pipeline.trigger_source >>]
364364
- equal: ["release check", << pipeline.schedule.name >>]
365-
- not: << pipeline.parameters.success-flag >>
366-
- not: << pipeline.parameters.validation-flag >>
365+
- not: << pipeline.parameters.success_flag >>
366+
- not: << pipeline.parameters.validation_flag >>
367367
jobs:
368368
- toolkit/save_next_version:
369-
min_rust_version: << pipeline.parameters.min-rust-version >>
369+
min_rust_version: << pipeline.parameters.min_rust_version >>
370370

371371
- toolkit/make_release:
372372
name: cargo release
@@ -376,11 +376,11 @@ workflows:
376376
- release
377377
- bot-check
378378
ssh_fingerprint: << pipeline.parameters.fingerprint >>
379-
min_rust_version: << pipeline.parameters.min-rust-version >>
379+
min_rust_version: << pipeline.parameters.min_rust_version >>
380380
pcu_verbosity: << pipeline.parameters.pcu_verbosity >>
381381
when_github_release: false
382382
- toolkit/no_release:
383-
min_rust_version: << pipeline.parameters.min-rust-version >>
383+
min_rust_version: << pipeline.parameters.min_rust_version >>
384384
requires:
385385
- toolkit/save_next_version:
386386
- failed
@@ -393,7 +393,7 @@ workflows:
393393
- release
394394
- bot-check
395395
ssh_fingerprint: << pipeline.parameters.fingerprint >>
396-
min_rust_version: << pipeline.parameters.min-rust-version >>
396+
min_rust_version: << pipeline.parameters.min_rust_version >>
397397
when_cargo_release: false
398398
pcu_verbosity: << pipeline.parameters.pcu_verbosity >>
399399
package: hcaptcha

0 commit comments

Comments
 (0)