Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: disable rust-proto-check in ci #1898

Merged
merged 5 commits into from
May 13, 2024
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
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/ethereum-verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ lazy_static = { workspace = true }
memory-db = { version = "0.32.0", default-features = false }
milagro_bls = { workspace = true }
primitive-types = { workspace = true, features = ["rlp"] }
rlp = { workspace = true, features = ["derive"] }
rlp = { workspace = true, features = ["derive", "std"] }
serde = { workspace = true, features = ["derive"] }
sha2 = { workspace = true }
sha3 = { workspace = true }
Expand Down
4 changes: 0 additions & 4 deletions lib/ics-008-wasm-client/src/storage_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ pub fn read_client_state<T>(
) -> Result<wasm::client_state::ClientState<T::ClientState>, IbcClientError<T>>
where
T: IbcClient,
Any<wasm::client_state::ClientState<T::ClientState>>: Decode<Proto>,
{
read_prefixed_client_state::<T>(deps, "")
}
Expand All @@ -71,7 +70,6 @@ pub fn read_consensus_state<T>(
height: &Height,
) -> Result<Option<wasm::consensus_state::ConsensusState<T::ConsensusState>>, IbcClientError<T>>
where
Any<wasm::consensus_state::ConsensusState<T::ConsensusState>>: Decode<Proto>,
T: IbcClient,
{
read_prefixed_consensus_state::<T>(deps, height, "")
Expand Down Expand Up @@ -150,7 +148,6 @@ pub fn read_subject_client_state<T>(
deps: Deps<T::CustomQuery>,
) -> Result<wasm::client_state::ClientState<T::ClientState>, IbcClientError<T>>
where
Any<wasm::client_state::ClientState<T::ClientState>>: Decode<Proto>,
T: IbcClient,
{
read_prefixed_client_state::<T>(deps, SUBJECT_CLIENT_STORE_PREFIX)
Expand All @@ -161,7 +158,6 @@ pub fn read_substitute_client_state<T>(
deps: Deps<T::CustomQuery>,
) -> Result<wasm::client_state::ClientState<T::ClientState>, IbcClientError<T>>
where
Any<wasm::client_state::ClientState<T::ClientState>>: Decode<Proto>,
T: IbcClient,
{
read_prefixed_client_state::<T>(deps, SUBSTITUTE_CLIENT_STORE_PREFIX)
Expand Down
3 changes: 2 additions & 1 deletion tools/biome/biome.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
in
{
_module.args.biome = biome;
checks.biome-lint = mkCi (system == "x86_64-linux") (pkgs.stdenv.mkDerivation {
# (system == "x86_64-linux")
checks.biome-lint = mkCi false (pkgs.stdenv.mkDerivation {
name = "biome-lint";
description = "Lint js,ts,jsx,tsx,d.ts,json,jsonc,astro,svelte,vue files";
src = with unstablePkgs.lib.fileset; toSource {
Expand Down
2 changes: 1 addition & 1 deletion tools/rust-proto.nix
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
});

checks = {
rust-proto-check = mkCi (system == "x86_64-linux") (pkgs.stdenv.mkDerivation {
rust-proto-check = mkCi false (pkgs.stdenv.mkDerivation {
name = "rust-proto-is-committed";
description = "check that rust protos in git repo are the same as those that are generated in rust-proto derivation";
src = ../.;
Expand Down
16 changes: 8 additions & 8 deletions tools/rust/crane.nix
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
# the directory that contains the Cargo.toml and src/ for the crate,
# relative to the repository root.
crateDirFromRoot
, # extra attributes to be passed to craneLib.cargoNextest.
, # extra attributes to be passed to craneLib.cargoTest.
cargoTestExtraAttrs ? { }
, # extra args to be passed to cargo build.
cargoBuildExtraArgs ? ""
Expand Down Expand Up @@ -243,17 +243,17 @@

artifacts = craneLib.buildDepsOnly crateAttrs;

cargoNextestAttrs =
cargoTestAttrs =
builtins.addErrorContext
"while evaluating `cargoNextestArgs` for crate `${cratePname}`"
"while evaluating `cargoTestArgs` for crate `${cratePname}`"
(
let
crateAttrsWithArtifactsNextest = crateAttrs // {
crateAttrsWithArtifactsTest = crateAttrs // {
doNotLinkInheritedArtifacts = true;
cargoArtifacts = artifacts;
buildPhaseCargoCommand = "cargo nextest run ${packageFilterArg}";
buildPhaseCargoCommand = "cargo test ${packageFilterArg}";
};
sharedAttrs = builtins.intersectAttrs crateAttrsWithArtifactsNextest cargoTestExtraAttrs;
sharedAttrs = builtins.intersectAttrs crateAttrsWithArtifactsTest cargoTestExtraAttrs;
in
lib.throwIfNot
(sharedAttrs == { })
Expand All @@ -264,7 +264,7 @@
(attrName: "cargoTestExtraAttrs is overwriting attribute `${attrName}`")
(builtins.attrNames sharedAttrs))
}\n\nNOTE: if more configuration is needed, update `crane.buildWorkspaceMember`"
(crateAttrsWithArtifactsNextest // cargoTestExtraAttrs)
(crateAttrsWithArtifactsTest // cargoTestExtraAttrs)
);

in
Expand Down Expand Up @@ -294,7 +294,7 @@
cargoArtifacts = artifacts;
cargoClippyExtraArgs = "--tests -- --deny warnings ${cargoClippyExtraArgs}";
}));
tests = mkCi (system == "x86_64-linux") (craneLib.cargoNextest cargoNextestAttrs);
tests = mkCi (system == "x86_64-linux") (craneLib.cargoTest cargoTestAttrs);
};
};

Expand Down
Loading
Loading