Skip to content

Commit 0e7bd9f

Browse files
JeremieRodonJeremieRodon
committed
CI Fix: Using Rust v1.81.0 throughout the CI. Also updated 2 test-build failure outputs
1 parent 4896466 commit 0e7bd9f

4 files changed

Lines changed: 60 additions & 90 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,11 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v4
2525

26-
- name: Install Rust Toolchain
27-
uses: dtolnay/rust-toolchain@stable
26+
- name: Install Rust 1.81.0
27+
uses: dtolnay/rust-toolchain@1.81.0
2828
with:
2929
components: rustfmt, clippy
3030

31-
- name: Pin dependencies
32-
run: |
33-
# Create lockfile
34-
cargo update
35-
# Pin base64ct to 1.7.3
36-
cargo update -p base64ct --precise 1.7.3
37-
3831
- name: Cargo Format Check
3932
run: cargo fmt --all -- --check
4033

@@ -50,21 +43,5 @@ jobs:
5043
- name: Build Documentation
5144
run: cargo doc --no-deps --document-private-items
5245

53-
msrv:
54-
name: MSRV Check
55-
runs-on: ubuntu-latest
56-
steps:
57-
- uses: actions/checkout@v4
58-
59-
- name: Install Rust 1.81.0
60-
uses: dtolnay/rust-toolchain@1.81.0
61-
62-
- name: Pin dependencies
63-
run: |
64-
# Create lockfile
65-
cargo update
66-
# Pin base64ct to 1.7.3
67-
cargo update -p base64ct --precise 1.7.3
68-
6946
- name: Check MSRV Build
7047
run: cargo check --all-features

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,11 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414

15-
- name: Install Rust Toolchain
16-
uses: dtolnay/rust-toolchain@stable
15+
- name: Install Rust 1.81.0
16+
uses: dtolnay/rust-toolchain@1.81.0
1717
with:
1818
components: rustfmt, clippy
1919

20-
- name: Pin dependencies
21-
run: |
22-
# Create lockfile
23-
cargo update
24-
# Pin base64ct to 1.7.3
25-
cargo update -p base64ct --precise 1.7.3
26-
2720
- name: Run Tests
2821
run: cargo test --all-features --workspace
2922

@@ -43,8 +36,8 @@ jobs:
4336
steps:
4437
- uses: actions/checkout@v4
4538

46-
- name: Install Rust Toolchain
47-
uses: dtolnay/rust-toolchain@stable
39+
- name: Install Rust 1.81.0
40+
uses: dtolnay/rust-toolchain@1.81.0
4841

4942
- name: Login to crates.io
5043
run: cargo login ${{ secrets.CRATES_IO_TOKEN }}
@@ -64,8 +57,8 @@ jobs:
6457
steps:
6558
- uses: actions/checkout@v4
6659

67-
- name: Install Rust Toolchain
68-
uses: dtolnay/rust-toolchain@stable
60+
- name: Install Rust 1.81.0
61+
uses: dtolnay/rust-toolchain@1.81.0
6962

7063
- name: Login to crates.io
7164
run: cargo login ${{ secrets.CRATES_IO_TOKEN }}

‎lambda-appsync-proc/tests/fail/missing_arg.stderr‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
error[E0308]: mismatched types
2-
--> tests/fail/missing_arg.rs:6:1
3-
|
4-
6 | #[appsync_operation(mutation(createPlayer))]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6-
| |
7-
| expected `(String,)`, found `()`
8-
| this expression has type `(std::string::String,)`
9-
|
10-
= note: expected tuple `(std::string::String,)`
11-
found unit type `()`
12-
= note: this error originates in the attribute macro `appsync_operation` (in Nightly builds, run with -Z macro-backtrace for more info)
13-
141
error[E0593]: function is expected to take 1 argument, but it takes 0 arguments
152
--> tests/fail/missing_arg.rs:7:10
163
|
@@ -28,3 +15,16 @@ note: required by a bound in `create_player::without_event::check_signature`
2815
3 | appsync_lambda_main!("../../../../schema.graphql");
2916
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `check_signature`
3017
= note: this error originates in the macro `appsync_lambda_main` (in Nightly builds, run with -Z macro-backtrace for more info)
18+
19+
error[E0308]: mismatched types
20+
--> tests/fail/missing_arg.rs:6:1
21+
|
22+
6 | #[appsync_operation(mutation(createPlayer))]
23+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24+
| |
25+
| expected `(String,)`, found `()`
26+
| this expression has type `(std::string::String,)`
27+
|
28+
= note: expected tuple `(std::string::String,)`
29+
found unit type `()`
30+
= note: this error originates in the attribute macro `appsync_operation` (in Nightly builds, run with -Z macro-backtrace for more info)

‎lambda-appsync-proc/tests/fail/missing_arg_with_event.stderr‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,3 @@
1-
error[E0308]: mismatched types
2-
--> tests/fail/missing_arg_with_event.rs:26:1
3-
|
4-
26 | #[appsync_operation(query(player), with_appsync_event)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6-
| |
7-
| expected a tuple with 2 elements, found one with 1 element
8-
| this expression has type `(ID, &AppsyncEvent<Operation>)`
9-
|
10-
= note: expected tuple `(ID, &AppsyncEvent<Operation>)`
11-
found tuple `(_,)`
12-
= note: this error originates in the attribute macro `appsync_operation` (in Nightly builds, run with -Z macro-backtrace for more info)
13-
14-
error[E0308]: mismatched types
15-
--> tests/fail/missing_arg_with_event.rs:6:1
16-
|
17-
6 | #[appsync_operation(mutation(createPlayer), with_appsync_event)]
18-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
19-
| |
20-
| expected `(String, &AppsyncEvent<Operation>)`, found `()`
21-
| this expression has type `(std::string::String, &AppsyncEvent<Operation>)`
22-
|
23-
= note: expected tuple `(std::string::String, &AppsyncEvent<Operation>)`
24-
found unit type `()`
25-
= note: this error originates in the attribute macro `appsync_operation` (in Nightly builds, run with -Z macro-backtrace for more info)
26-
27-
error[E0308]: mismatched types
28-
--> tests/fail/missing_arg_with_event.rs:16:1
29-
|
30-
16 | #[appsync_operation(mutation(deletePlayer), with_appsync_event)]
31-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
32-
| |
33-
| expected a tuple with 2 elements, found one with 1 element
34-
| this expression has type `(ID, &AppsyncEvent<Operation>)`
35-
|
36-
= note: expected tuple `(ID, &AppsyncEvent<Operation>)`
37-
found tuple `(_,)`
38-
= note: this error originates in the attribute macro `appsync_operation` (in Nightly builds, run with -Z macro-backtrace for more info)
39-
401
error[E0593]: function is expected to take 2 arguments, but it takes 0 arguments
412
--> tests/fail/missing_arg_with_event.rs:7:10
423
|
@@ -90,3 +51,42 @@ note: required by a bound in `player::with_event::check_signature`
9051
3 | appsync_lambda_main!("../../../../schema.graphql");
9152
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `check_signature`
9253
= note: this error originates in the macro `appsync_lambda_main` (in Nightly builds, run with -Z macro-backtrace for more info)
54+
55+
error[E0308]: mismatched types
56+
--> tests/fail/missing_arg_with_event.rs:26:1
57+
|
58+
26 | #[appsync_operation(query(player), with_appsync_event)]
59+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
60+
| |
61+
| expected a tuple with 2 elements, found one with 1 element
62+
| this expression has type `(ID, &AppsyncEvent<Operation>)`
63+
|
64+
= note: expected tuple `(ID, &AppsyncEvent<Operation>)`
65+
found tuple `(_,)`
66+
= note: this error originates in the attribute macro `appsync_operation` (in Nightly builds, run with -Z macro-backtrace for more info)
67+
68+
error[E0308]: mismatched types
69+
--> tests/fail/missing_arg_with_event.rs:6:1
70+
|
71+
6 | #[appsync_operation(mutation(createPlayer), with_appsync_event)]
72+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
73+
| |
74+
| expected `(String, &AppsyncEvent<Operation>)`, found `()`
75+
| this expression has type `(std::string::String, &AppsyncEvent<Operation>)`
76+
|
77+
= note: expected tuple `(std::string::String, &AppsyncEvent<Operation>)`
78+
found unit type `()`
79+
= note: this error originates in the attribute macro `appsync_operation` (in Nightly builds, run with -Z macro-backtrace for more info)
80+
81+
error[E0308]: mismatched types
82+
--> tests/fail/missing_arg_with_event.rs:16:1
83+
|
84+
16 | #[appsync_operation(mutation(deletePlayer), with_appsync_event)]
85+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
86+
| |
87+
| expected a tuple with 2 elements, found one with 1 element
88+
| this expression has type `(ID, &AppsyncEvent<Operation>)`
89+
|
90+
= note: expected tuple `(ID, &AppsyncEvent<Operation>)`
91+
found tuple `(_,)`
92+
= note: this error originates in the attribute macro `appsync_operation` (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)