Skip to content

Commit de13be5

Browse files
committed
Experiment with CI
1 parent d4c7038 commit de13be5

File tree

7 files changed

+35
-17
lines changed

7 files changed

+35
-17
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@ fmt:
7878
script:
7979
- cargo fmt --verbose --all -- --check
8080

81-
#clippy:
82-
#stage: check
83-
#<<: *docker-env
84-
#script:
85-
#- cargo clippy --verbose --all-targets --all-features -- -D warnings;
81+
clippy:
82+
stage: check
83+
<<: *docker-env
84+
script:
85+
- cargo clippy --verbose -- -D warnings;
86+
- cargo clippy --verbose --all-targets --all-features -- -D warnings;
8687

8788
#### stage: test (all features)
8889

Cargo.lock

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ version = "0.17.0"
77
authors = ["Parity Technologies <[email protected]>"]
88
build = "build.rs"
99
edition = "2021"
10-
rust-version = "1.56.1"
1110

1211
license = "GPL-3.0"
1312
readme = "README.md"

build.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ fn main() {
7575
dylint_dir.join("Cargo.toml").display()
7676
);
7777
let target_dir = format!("--target-dir={}", out_dir.as_path().display());
78+
//let target_dir = format!("--target-dir=/tmp/lalala/");
7879
let args = vec!["--release", &target_dir, &manifest_arg];
7980
invoke_cargo("build", &args, Some(dylint_dir.clone())).expect("dylint build failed");
8081

@@ -268,12 +269,31 @@ where
268269
let mut cmd = Command::new("cargo");
269270
cmd.env_remove("RUSTUP_TOOLCHAIN");
270271
cmd.env_remove("CARGO_TARGET_DIR");
272+
//cmd.env_remove("CARGO_HOME");
271273

272274
if let Some(path) = working_dir {
273275
println!("Setting cargo working dir to '{}'", path.as_ref().display());
274276
cmd.current_dir(path);
275277
}
276278

279+
//cmd.env("CARGO_TARGET_DIR", "/tmp/lalala");
280+
281+
/*
282+
cmd.arg("--version");
283+
let child = cmd
284+
// capture the stdout to return from this function as bytes
285+
.stdout(std::process::Stdio::piped())
286+
.spawn()
287+
.unwrap_or_else(|_| panic!("Error executing `{:?}`", cmd));
288+
let output = child.wait_with_output()?;
289+
eprintln!("output: {:?}", std::str::from_utf8(&output.stdout).expect("conversion must work"));
290+
//std::process::exit(1);
291+
*/
292+
293+
294+
295+
296+
277297
cmd.arg(command);
278298
cmd.args(args);
279299

metadata/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name = "contract-metadata"
33
version = "0.5.1"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2021"
6-
rust-version = "1.56.1"
76

87
license = "Apache-2.0"
98
readme = "README.md"

templates/new/_Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name = "{{name}}"
33
version = "0.1.0"
44
authors = ["[your_name] <[your_email]>"]
55
edition = "2021"
6-
rust-version = "1.56.1"
76

87
[dependencies]
98
ink_primitives = { version = "3.0.0-rc8", default-features = false }

templates/tools/generate-metadata/_Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name = "metadata-gen"
33
version = "0.1.0"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2021"
6-
rust-version = "1.56.1"
76
publish = false
87

98
[[bin]]

0 commit comments

Comments
 (0)