Skip to content

Commit 9af923e

Browse files
cmichicmichi
authored
Migrate from paritytech/ci-unified to useink/ci docker image (#2339)
* Migrate from `paritytech/ci-unified` to `useink/ci` docker image * Remove custom `cargo-contract` installation * Update test fixtures * Update test fixtures
1 parent ef876cf commit 9af923e

File tree

5 files changed

+53
-62
lines changed

5 files changed

+53
-62
lines changed

‎.github/rust-info/action.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,5 @@ runs:
1111
cargo spellcheck --version
1212
bash --version
1313
substrate-contracts-node --version
14-
15-
# TODO: The installation of `cargo-contract` here can be removed after
16-
# a new image of https://hub.docker.com/r/paritytech/ci-unified/tags has
17-
# been published. At the time of this commit the Docker image is from
18-
# Sep 11, 2024. This means that the `cargo-contract` binary in the image
19-
# is also that old. There was a bug with `cargo-contract` erring on
20-
# newer Rust versions (https://github.com/use-ink/cargo-contract/pull/1786),
21-
# hence we make sure to use the latest `cargo-contract` here.
22-
cargo install --git https://github.com/paritytech/cargo-contract --locked --branch master --force
2314
cargo-contract --version
2415
shell: bash

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
- 'FILE_HEADER'
2727

2828
env:
29-
IMAGE: paritytech/ci-unified:bullseye-1.81.0
29+
IMAGE: useink/ci
3030
CARGO_TARGET_DIR: /ci-cache/${{ github.repository }}/targets/${{ github.ref_name }}/${{ github.job }}
3131
CARGO_INCREMENTAL: 0
3232
PURELY_STD_CRATES: ink/codegen metadata engine e2e e2e/macro ink/ir
@@ -505,7 +505,7 @@ jobs:
505505
env:
506506
# Fix linking of `linkme`: https://github.com/dtolnay/linkme/issues/49
507507
RUSTFLAGS: -Clink-arg=-z -Clink-arg=nostart-stop-gc
508-
uses: docker://paritytech/ci-unified:bullseye-1.81.0
508+
uses: docker://useink/ci
509509
with:
510510
# run all tests with --all-features, which will run the e2e-tests feature if present
511511
args: /bin/bash -c "scripts/for_all_contracts_exec.sh --path integration-tests --ignore public/static-buffer --partition ${{ matrix.partition }}/6 -- cargo test \

‎.github/workflows/measurements.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
run:
1515
shell: bash
1616
container:
17-
image: paritytech/ci-unified:bullseye-1.81.0
17+
image: useink/ci
1818
strategy:
1919
fail-fast: false
2020
matrix:

‎crates/ink/tests/ui/storage_item/fail/collections_only_packed_1.stderr‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,56 @@ error[E0277]: the trait bound `[NonPacked]: Encode` is not satisfied
2323
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
2424
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
2525

26+
error[E0277]: the trait bound `Vec<NonPacked>: ink::parity_scale_codec::Decode` is not satisfied
27+
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:10:8
28+
|
29+
10 | struct Contract {
30+
| ^^^^^^^^ the trait `ink::parity_scale_codec::Decode` is not implemented for `Vec<NonPacked>`, which is required by `Contract: Sized`
31+
|
32+
= help: the trait `ink::parity_scale_codec::Decode` is implemented for `Vec<T>`
33+
= note: required for `Vec<NonPacked>` to implement `Packed`
34+
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
35+
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
36+
note: required because it appears within the type `Contract`
37+
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:10:8
38+
|
39+
10 | struct Contract {
40+
| ^^^^^^^^
41+
note: required by a bound in `ink_storage::ink_storage_traits::StorableHint::Type`
42+
--> $WORKSPACE/crates/storage/traits/src/storage.rs
43+
|
44+
| type Type: Storable;
45+
| ^^^^^^^^^^^^^^^^^^^^ required by this bound in `StorableHint::Type`
46+
47+
error[E0277]: the trait bound `[NonPacked]: Encode` is not satisfied
48+
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:10:8
49+
|
50+
10 | struct Contract {
51+
| ^^^^^^^^ the trait `Encode` is not implemented for `[NonPacked]`, which is required by `Contract: Sized`
52+
|
53+
9 | #[ink::storage_item]
54+
| ^^^^^^^^^^^^^^^^^^^^ the trait `Encode` is not implemented for `[NonPacked]`, which is required by `Vec<NonPacked>: AutoStorableHint<ManualKey<453539032>>`
55+
|
56+
= help: the following other types implement trait `Encode`:
57+
[T; N]
58+
[T]
59+
= note: required for `Vec<NonPacked>` to implement `Encode`
60+
= note: required for `Vec<NonPacked>` to implement `Packed`
61+
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
62+
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
63+
= note: this error originates in the derive macro `::ink::storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
64+
65+
error[E0277]: the trait bound `NonPacked: WrapperTypeDecode` is not satisfied
66+
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:11:8
67+
|
68+
11 | a: Vec<NonPacked>,
69+
| ^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `NonPacked`, which is required by `Vec<NonPacked>: StorageLayout`
70+
|
71+
= help: the following other types implement trait `WrapperTypeDecode`:
72+
Arc<T>
73+
Box<T>
74+
Rc<T>
75+
sp_core::Bytes
2676
= note: required for `NonPacked` to implement `ink::parity_scale_codec::Decode`
2777
= note: required for `NonPacked` to implement `Packed`
2878
= note: required for `Vec<NonPacked>` to implement `StorageLayout`

‎crates/ink/tests/ui/storage_item/fail/collections_only_packed_2.stderr‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,56 +9,6 @@ error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: Packed` is not satisfi
99
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
1010
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
1111

12-
error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: Packed` is not satisfied
13-
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:11:8
14-
|
15-
11 | a: BTreeMap<u128, NonPacked>,
16-
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Encode` is not implemented for `BTreeMap<u128, NonPacked>`, which is required by `BTreeMap<u128, NonPacked>: AutoStorableHint<ManualKey<453539032>>`
17-
|
18-
= help: the trait `Encode` is implemented for `BTreeMap<K, V>`
19-
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
20-
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
21-
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
22-
23-
error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: ink::parity_scale_codec::Decode` is not satisfied
24-
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:10:8
25-
|
26-
10 | struct Contract {
27-
| ^^^^^^^^ the trait `ink::parity_scale_codec::Decode` is not implemented for `BTreeMap<u128, NonPacked>`, which is required by `Contract: Sized`
28-
|
29-
= help: the trait `ink::parity_scale_codec::Decode` is implemented for `BTreeMap<K, V>`
30-
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
31-
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
32-
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
33-
note: required because it appears within the type `Contract`
34-
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:10:8
35-
|
36-
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:9:1
37-
|
38-
9 | #[ink::storage_item]
39-
| ^^^^^^^^^^^^^^^^^^^^ the trait `Encode` is not implemented for `BTreeMap<u128, NonPacked>`, which is required by `BTreeMap<u128, NonPacked>: AutoStorableHint<ManualKey<453539032>>`
40-
|
41-
= help: the trait `Encode` is implemented for `BTreeMap<K, V>`
42-
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
43-
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
44-
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
45-
= note: this error originates in the derive macro `::ink::storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
46-
47-
error[E0277]: the trait bound `NonPacked: WrapperTypeDecode` is not satisfied
48-
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:11:8
49-
|
50-
11 | a: BTreeMap<u128, NonPacked>,
51-
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `NonPacked`, which is required by `BTreeMap<u128, NonPacked>: StorageLayout`
52-
|
53-
= help: the following other types implement trait `WrapperTypeDecode`:
54-
Arc<T>
55-
Box<T>
56-
Rc<T>
57-
sp_core::Bytes
58-
= note: required for `NonPacked` to implement `ink::parity_scale_codec::Decode`
59-
= note: required for `NonPacked` to implement `Packed`
60-
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorageLayout`
61-
6212
error[E0277]: the trait bound `NonPacked: WrapperTypeEncode` is not satisfied
6313
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:11:8
6414
|

0 commit comments

Comments
 (0)