Skip to content

Commit 349d086

Browse files
gilescopealvicsam
authored andcommitted
Updating shell.nix nightly (paritytech#11266)
* The 2022-02-10 nightly can't build some deps There's a sig that returns `impl IntoIterator<Item = (&'static str, OsString)>` and an Option is being retured but it's incorrectly not allowing a `?` in the method. * removing duplicate test * [ci] add job cargo-check-nixos * add dummy variables nix check * fix check-dependent jobs * fix check-dependent-project template Co-authored-by: alvicsam <[email protected]>
1 parent 025fa32 commit 349d086

File tree

3 files changed

+16
-19
lines changed

3 files changed

+16
-19
lines changed

.gitlab-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,20 @@ cargo-clippy:
263263
script:
264264
- SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets
265265

266+
cargo-check-nixos:
267+
stage: test
268+
<<: *docker-env
269+
<<: *test-refs
270+
before_script: []
271+
variables:
272+
CI_IMAGE: "nixos/nix"
273+
SNAP: "DUMMY"
274+
WS_API: "DUMMY"
275+
script:
276+
- nix-channel --update
277+
- nix-shell shell.nix
278+
- nix-shell --run "cargo check --workspace --all-targets --all-features"
279+
266280
cargo-check-benches:
267281
stage: test
268282
<<: *docker-env

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let
55
rev = "15b7a05f20aab51c4ffbefddb1b448e862dccb7d";
66
});
77
nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
8-
rust-nightly = with nixpkgs; ((rustChannelOf { date = "2022-02-10"; channel = "nightly"; }).rust.override {
8+
rust-nightly = with nixpkgs; ((rustChannelOf { date = "2022-04-20"; channel = "nightly"; }).rust.override {
99
extensions = [ "rust-src" ];
1010
targets = [ "wasm32-unknown-unknown" ];
1111
});

utils/frame/remote-externalities/src/lib.rs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,21 +1098,6 @@ mod remote_tests {
10981098
}
10991099
}
11001100

1101-
#[tokio::test]
1102-
async fn can_build_child_tree() {
1103-
init_logger();
1104-
Builder::<Block>::new()
1105-
.mode(Mode::Online(OnlineConfig {
1106-
transport: "wss://rpc.polkadot.io:443".to_owned().into(),
1107-
pallets: vec!["Crowdloan".to_owned()],
1108-
..Default::default()
1109-
}))
1110-
.build()
1111-
.await
1112-
.expect(REMOTE_INACCESSIBLE)
1113-
.execute_with(|| {});
1114-
}
1115-
11161101
#[tokio::test]
11171102
async fn can_create_child_snapshot() {
11181103
init_logger();
@@ -1196,9 +1181,7 @@ mod remote_tests {
11961181
init_logger();
11971182
Builder::<Block>::new()
11981183
.mode(Mode::Online(OnlineConfig {
1199-
// transport: "wss://kusama-rpc.polkadot.io".to_owned().into(),
1200-
transport: "ws://kianenigma-archive:9924".to_owned().into(),
1201-
// transport: "ws://localhost:9999".to_owned().into(),
1184+
transport: "wss://rpc.polkadot.io:443".to_owned().into(),
12021185
pallets: vec!["Crowdloan".to_owned()],
12031186
..Default::default()
12041187
}))

0 commit comments

Comments
 (0)