Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,20 @@ cargo-clippy:
script:
- SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets

cargo-check-nixos:
stage: test
<<: *docker-env
<<: *test-refs
before_script: []
variables:
CI_IMAGE: "nixos/nix"
SNAP: "DUMMY"
WS_API: "DUMMY"
script:
- nix-channel --update
- nix-shell shell.nix
- nix-shell --run "cargo check --workspace --all-targets --all-features"

cargo-check-benches:
stage: test
<<: *docker-env
Expand Down Expand Up @@ -468,12 +482,10 @@ cargo-check-macos:
"--branch=$PIPELINE_SCRIPTS_TAG"
https://github.com/paritytech/pipeline-scripts
- ./pipeline-scripts/check_dependent_project.sh
paritytech
substrate
--substrate
"$DEPENDENT_REPO"
"$GITHUB_PR_TOKEN"
"$CARGO_UPDATE_CRATES"
--org paritytech
--dependent-repo "$DEPENDENT_REPO"
--github-api-token "$GITHUB_PR_TOKEN"
--extra-dependencies "$EXTRA_DEPENDENCIES"

# Individual jobs are set up for each dependent project so that they can be ran in parallel.
# Arguably we could generate a job for each companion in the PR's description using Gitlab's
Expand All @@ -483,13 +495,12 @@ check-dependent-polkadot:
<<: *check-dependent-project
variables:
DEPENDENT_REPO: polkadot
CARGO_UPDATE_CRATES: "sp-io"

check-dependent-cumulus:
<<: *check-dependent-project
variables:
DEPENDENT_REPO: cumulus
CARGO_UPDATE_CRATES: "sp-io polkadot-runtime-common"
EXTRA_DEPENDENCIES: polkadot


build-linux-substrate:
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ let
rev = "15b7a05f20aab51c4ffbefddb1b448e862dccb7d";
});
nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
rust-nightly = with nixpkgs; ((rustChannelOf { date = "2022-02-10"; channel = "nightly"; }).rust.override {
rust-nightly = with nixpkgs; ((rustChannelOf { date = "2022-04-20"; channel = "nightly"; }).rust.override {
extensions = [ "rust-src" ];
targets = [ "wasm32-unknown-unknown" ];
});
Expand Down
19 changes: 1 addition & 18 deletions utils/frame/remote-externalities/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1098,21 +1098,6 @@ mod remote_tests {
}
}

#[tokio::test]
async fn can_build_child_tree() {
init_logger();
Builder::<Block>::new()
.mode(Mode::Online(OnlineConfig {
transport: "wss://rpc.polkadot.io:443".to_owned().into(),
pallets: vec!["Crowdloan".to_owned()],
..Default::default()
}))
.build()
.await
.expect(REMOTE_INACCESSIBLE)
.execute_with(|| {});
}

#[tokio::test]
async fn can_create_child_snapshot() {
init_logger();
Expand Down Expand Up @@ -1196,9 +1181,7 @@ mod remote_tests {
init_logger();
Builder::<Block>::new()
.mode(Mode::Online(OnlineConfig {
// transport: "wss://kusama-rpc.polkadot.io".to_owned().into(),
transport: "ws://kianenigma-archive:9924".to_owned().into(),
// transport: "ws://localhost:9999".to_owned().into(),
transport: "wss://rpc.polkadot.io:443".to_owned().into(),
pallets: vec!["Crowdloan".to_owned()],
..Default::default()
}))
Expand Down