Skip to content

Commit 84b76fe

Browse files
committed
Experiment with CI
1 parent 241a188 commit 84b76fe

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ clippy:
8282
stage: check
8383
<<: *docker-env
8484
script:
85-
- cargo clippy --verbose --all-targets --all-features -- -D warnings;
85+
#- cargo clippy --verbose --all-targets --all-features -- -D warnings;
8686

8787
#### stage: test (all features)
8888

build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ fn main() {
8686
dylint_dst_file.display()
8787
);
8888

89-
let zipped_lints = match zip_lint_driver(
89+
let zipped_lints = match zip_dylint_driver(
9090
&out_dir.join("release"),
9191
&dylint_dst_file,
9292
CompressionMethod::Stored,
@@ -159,7 +159,10 @@ fn zip_dir(src_dir: &Path, dst_file: &Path, method: CompressionMethod) -> Result
159159
Ok(())
160160
}
161161

162-
fn zip_lint_driver(src_dir: &Path, dst_file: &Path, method: CompressionMethod) -> Result<()> {
162+
/// Creates a zip archive at `dst_file` with the `dylint` driver found in `src_dir`.
163+
///
164+
/// `dylint` drivers have a file name of the form `libink_linting@toolchain.[so,dll]`.
165+
fn zip_dylint_driver(src_dir: &Path, dst_file: &Path, method: CompressionMethod) -> Result<()> {
163166
if !src_dir.exists() {
164167
anyhow::bail!("src_dir '{}' does not exist", src_dir.display());
165168
}

src/cmd/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ pub(crate) fn execute(args: ExecuteArgs) -> Result<BuildResult> {
745745
format!("[1/{}]", build_artifact.steps()).bold(),
746746
"Checking ink! lints".bright_green().bold()
747747
);
748-
//exec_cargo_dylint(&crate_metadata, verbosity)?;
748+
exec_cargo_dylint(&crate_metadata, verbosity)?;
749749

750750
maybe_println!(
751751
verbosity,

0 commit comments

Comments
 (0)