Merge #826

826: cleanup r=Alexhuszagh a=Emilgardis



Co-authored-by: Emil Gardström <[email protected]>

Author: bors[bot]

.github/workflows/ci.yml

@@ -20,6 +20,12 @@ jobs:
       - name: Run ShellCheck
         uses: azohra/[email protected]
 
+  cargo-deny:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: EmbarkStudios/cargo-deny-action@v1
+
   fmt:
     runs-on: ubuntu-latest
     steps:

.github/workflows/weekly.yml

@@ -22,4 +22,9 @@ jobs:
         run: cargo build -p xtask
       - name: Build Docker image
         id: build-docker-image
-        run: cargo xtask build-docker-image -v --no-cache --no-output --from-ci --tag weekly
+        run: cargo xtask build-docker-image -v --no-cache --no-output --from-ci --no-fastfail --tag weekly
+  cargo-deny:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: EmbarkStudios/cargo-deny-action@v1

Cargo.lock

@@ -42,7 +42,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_ignored = "0.1.2"
 shell-words = "1.1.0"
-sha1_smol = "1.0.0"
+const-sha1 = "0.2.0"
 
 [target.'cfg(not(windows))'.dependencies]
 nix = { version = "0.24", default-features = false, features = ["user"] }

Cargo.toml

@@ -174,28 +174,3 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    of your accepting any such warranty or additional liability.
 
 END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

LICENSE-APACHE

@@ -1,3 +1,4 @@
+Copyright (c) 2017-2022 by the respective authors
 Copyright (c) 2016 Jorge Aparicio
 
 Permission is hereby granted, free of charge, to any

LICENSE-MIT

@@ -0,0 +1,34 @@
+
+# only check for the targets we currently publish
+targets = [
+  { triple = "x86_64-apple-darwin" },
+  { triple = "x86_64-unknown-linux-gnu" },
+  { triple = "x86_64-unknown-linux-musl" },
+  { triple = "x86_64-pc-windows-msvc" },
+]
+
+[advisories]
+vulnerability = "deny"
+unmaintained = "deny"
+notice = "deny"
+unsound = "deny"
+ignore = []
+
+[bans]
+multiple-versions = "deny"
+deny = []
+
+[sources]
+unknown-registry = "deny"
+unknown-git = "deny"
+allow-git = []
+
+[licenses]
+unlicensed = "deny"
+allow-osi-fsf-free = "neither"
+copyleft = "deny"
+confidence-threshold = 0.93
+allow = ["Apache-2.0", "MIT", "CC0-1.0"]
+
+[licenses.private]
+ignore = true

deny.toml

@@ -114,12 +114,14 @@ impl<'a> Dockerfile<'a> {
                     .file_name()
                     .expect("workspace_root can't end in `..`")
                     .to_string_lossy(),
-                path_hash =
-                    sha1_smol::Sha1::from(&metadata.workspace_root.to_string_lossy().as_bytes())
-                        .digest()
-                        .to_string()
-                        .get(..5)
-                        .expect("sha1 is expected to be at least 5 characters long"),
+                path_hash = format!(
+                    "{}",
+                    const_sha1::sha1(&const_sha1::ConstBuffer::from_slice(
+                        metadata.workspace_root.to_string_lossy().as_bytes()
+                    ))
+                )
+                .get(..5)
+                .expect("sha1 is expected to be at least 5 characters long"),
                 custom = if matches!(self, Self::File { .. }) {
                     ""
                 } else {

src/docker/custom.rs

@@ -5,6 +5,7 @@ name = "xtask"
 repository = "https://github.com/cross-rs/cross"
 version = "0.0.0-dev.0"
 edition = "2021"
+publish = false
 
 
 [dependencies]