Skip to content

Commit 81452c2

Browse files
committed
fix(ci): stabilize review workflow updates
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
1 parent ff3e0a2 commit 81452c2

10 files changed

Lines changed: 27 additions & 25 deletions

File tree

.github/workflows/canary-container-images.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ concurrency:
1010
cancel-in-progress: true
1111

1212
permissions:
13+
actions: write
1314
contents: read
15+
id-token: write
1416
packages: write
1517

1618
jobs:
@@ -66,19 +68,19 @@ jobs:
6668
provenance: mode=max
6769

6870
- name: Scan image for vulnerabilities
69-
uses: aquasecurity/trivy-action@0.32.0
71+
uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # v0.32.0
7072
with:
71-
image-ref: ${{ steps.image.outputs.name }}:canary
73+
image-ref: ${{ steps.image.outputs.name }}@${{ steps.build_image.outputs.digest }}
7274
scanners: vuln
7375
format: table
7476
output: trivy-results.txt
7577
ignore-unfixed: true
7678
exit-code: 0
7779

7880
- name: Generate SBOM
79-
uses: anchore/sbom-action@v0.20.6
81+
uses: anchore/sbom-action@f8bdd1d8ac5e901a77a92f111440fdb1b593736b # v0.20.6
8082
with:
81-
image: ${{ steps.image.outputs.name }}:canary
83+
image: ${{ steps.image.outputs.name }}@${{ steps.build_image.outputs.digest }}
8284
artifact-name: sbom-${{ matrix.service }}-spdx
8385
format: spdx-json
8486

@@ -88,7 +90,7 @@ jobs:
8890
{
8991
echo "## Image security audit: \`${{ matrix.service }}\`"
9092
echo ""
91-
echo "- Image: \`${{ steps.image.outputs.name }}:canary\`"
93+
echo "- Image: \`${{ steps.image.outputs.name }}@${{ steps.build_image.outputs.digest }}\`"
9294
echo "- Runtime base: \`debian:bookworm-20260518-slim\`"
9395
echo "- SBOM artifact: \`sbom-${{ matrix.service }}-spdx\` (SPDX JSON)"
9496
echo ""

.github/workflows/docs-pages.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@ jobs:
2424
persist-credentials: false
2525
fetch-depth: 0
2626

27+
- name: Setup pnpm
28+
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
29+
with:
30+
package_json_file: docs/package.json
31+
2732
- name: Setup Node
2833
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
2934
with:
3035
node-version: 26
3136
cache: pnpm
3237
cache-dependency-path: docs/pnpm-lock.yaml
3338

34-
- name: Enable Corepack
35-
run: corepack enable
36-
3739
- name: Setup Pages
3840
uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d
3941

.mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ depends = ["build:rust", "build:docs"]
1818

1919
[tasks."build:docs"]
2020
dir = "docs"
21-
run = "pnpm install --frozen-lockfile && pnpm docs:build"
21+
run = "pnpm docs:build"
2222

2323
[tasks."build:rust"]
2424
dir = "rsworkspace"

rsworkspace/crates/trogon-decider/tests/ui/fail/after_then.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ error[E0599]: no method named `when` found for struct `ThenEvents<Event>` in the
77
| _____method `when` is available on `TestCase<TestCommand>`
88
| |
99
10 | | .given_no_history()
10-
| | ------------------ method `when` is available on `TestCase<TestCommand, NoHistory>`
10+
| | ------------------ method `when` is available on `TestCase<TestCommand, trogon_decider::testing::NoHistory>`
1111
11 | | .when(TestCommand)
12-
| | ----------------- method `when` is available on `TestCase<TestCommand, When<TestEvent, TestState, TestCommand>>`
12+
| | ----------------- method `when` is available on `TestCase<TestCommand, trogon_decider::testing::When<TestEvent, TestState, TestCommand>>`
1313
12 | | .then([TestEvent::Registered])
1414
13 | | .when(TestCommand);
1515
| | -^^^^ method not found in `ThenEvents<TestEvent>`
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
error[E0599]: no method named `given` found for struct `TestCase<TestCommand, NoHistory>` in the current scope
1+
error[E0599]: no method named `given` found for struct `TestCase<TestCommand, trogon_decider::testing::NoHistory>` in the current scope
22
--> tests/ui/fail/double_given.rs:11:10
33
|
44
9 | / TestCase::<TestCommand>::new()
55
10 | | .given_no_history()
66
11 | | .given([]);
7-
| | -^^^^^ method not found in `TestCase<TestCommand, NoHistory>`
7+
| | -^^^^^ method not found in `TestCase<TestCommand, trogon_decider::testing::NoHistory>`
88
| |_________|
99
|
1010
|
1111
= note: the method was found for
12-
- `TestCase<C, Given<<C as Decider>::Event>>`
12+
- `TestCase<C, trogon_decider::testing::Given<<C as Decider>::Event>>`
1313
- `TestCase<C>`

rsworkspace/crates/trogon-decider/tests/ui/fail/double_when.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0599]: no method named `when` found for struct `TestCase<TestCommand, When<TestEvent, TestState, TestCommand>>` in the current scope
1+
error[E0599]: no method named `when` found for struct `TestCase<TestCommand, trogon_decider::testing::When<TestEvent, TestState, TestCommand>>` in the current scope
22
--> tests/ui/fail/double_when.rs:12:10
33
|
44
9 | TestCase::<TestCommand>::new()
@@ -7,7 +7,7 @@ error[E0599]: no method named `when` found for struct `TestCase<TestCommand, Whe
77
| _____method `when` is available on `TestCase<TestCommand>`
88
| |
99
10 | | .given_no_history()
10-
| | ------------------ method `when` is available on `TestCase<TestCommand, NoHistory>`
10+
| | ------------------ method `when` is available on `TestCase<TestCommand, trogon_decider::testing::NoHistory>`
1111
11 | | .when(TestCommand)
1212
12 | | .when(TestCommand);
1313
| |_________-^^^^

rsworkspace/crates/trogon-decider/tests/ui/fail/missing_given.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ error[E0599]: no method named `when` found for struct `TestCase<TestCommand>` in
55
| ^^^^ method not found in `TestCase<TestCommand>`
66
|
77
= note: the method was found for
8-
- `TestCase<C, Given<<C as Decider>::Event>>`
9-
- `TestCase<C, NoHistory>`
8+
- `TestCase<C, trogon_decider::testing::Given<<C as Decider>::Event>>`
9+
- `TestCase<C, trogon_decider::testing::NoHistory>`

rsworkspace/crates/trogon-decider/tests/ui/fail/missing_initial_when.stderr

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ error[E0599]: no method named `then_error` found for struct `TestCase<TestComman
77
| |_________|
88
|
99
|
10-
= note: the method was found for
11-
- `TestCase<C, When<<C as Decider>::Event, <C as Decider>::State, C>>`
10+
= note: the method was found for `TestCase<C, trogon_decider::testing::When<<C as Decider>::Event, <C as Decider>::State, C>>`
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
error[E0599]: no method named `then_error` found for struct `TestCase<TestCommand, NoHistory>` in the current scope
1+
error[E0599]: no method named `then_error` found for struct `TestCase<TestCommand, trogon_decider::testing::NoHistory>` in the current scope
22
--> tests/ui/fail/missing_when.rs:11:10
33
|
44
9 | / TestCase::<TestCommand>::new()
55
10 | | .given_no_history()
66
11 | | .then_error(TestDecisionError::AlreadyRegistered);
7-
| | -^^^^^^^^^^ method not found in `TestCase<TestCommand, NoHistory>`
7+
| | -^^^^^^^^^^ method not found in `TestCase<TestCommand, trogon_decider::testing::NoHistory>`
88
| |_________|
99
|
1010
|
11-
= note: the method was found for
12-
- `TestCase<C, When<<C as Decider>::Event, <C as Decider>::State, C>>`
11+
= note: the method was found for `TestCase<C, trogon_decider::testing::When<<C as Decider>::Event, <C as Decider>::State, C>>`

rsworkspace/crates/trogon-nats/src/jetstream/mocks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ impl JetStreamKvKeys for MockJetStreamKvStore {
932932
match result {
933933
Ok(keys) => {
934934
let items: Vec<Result<String, kv::WatcherError>> = keys.into_iter().map(Ok).collect();
935-
Ok(futures::stream::iter(items.into_iter()))
935+
Ok(futures::stream::iter(items))
936936
}
937937
Err(kind) => Err(kv::HistoryError::new(kind)),
938938
}

0 commit comments

Comments
 (0)