diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 46236247c..a5c493f62 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ # Default -* @expede +* @expede @zeeshanlakhani diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index aaaf74f3f..4a57bb579 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -9,6 +9,11 @@ jobs: runs-on: ubuntu-latest steps: + - name: Install Protoc + uses: arduino/setup-protoc@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout Repository uses: actions/checkout@v3 diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 41fa5d6de..46fc29d61 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -13,9 +13,15 @@ concurrency: jobs: benchmark: + continue-on-error: true runs-on: ubuntu-latest steps: + - name: Install Protoc + uses: arduino/setup-protoc@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout Repository uses: actions/checkout@v3 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c875b3509..d52e8b8ae 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -16,6 +16,11 @@ jobs: runs-on: ubuntu-latest steps: + - name: Install Protoc + uses: arduino/setup-protoc@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout Repository uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a73dedc8f..afc94ba64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,6 +47,11 @@ jobs: if: ${{ needs.release-please.outputs.release_created || github.event.inputs.force-publish }} steps: + - name: Install Protoc + uses: arduino/setup-protoc@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout Repository uses: actions/checkout@v3 diff --git a/.github/workflows/tests_and_checks.yml b/.github/workflows/tests_and_checks.yml index bf6d5d83b..676828d13 100644 --- a/.github/workflows/tests_and_checks.yml +++ b/.github/workflows/tests_and_checks.yml @@ -21,7 +21,7 @@ jobs: - stable - nightly # minimum version - - 1.64 + - 1.65 steps: - name: Install Protoc uses: arduino/setup-protoc@v1 @@ -88,6 +88,11 @@ jobs: - stable - nightly steps: + - name: Install Protoc + uses: arduino/setup-protoc@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout Repository uses: actions/checkout@v3 diff --git a/Cargo.toml b/Cargo.toml index 2d5c76c74..389106d8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ include = ["/src", "/benches", "README.md", "LICENSE"] license = "Apache" readme = "README.md" edition = "2021" -rust-version = "1.64" +rust-version = "1.65" documentation = "https://docs.rs/ipvm" repository = "https://github.com/ipvm-wg/ipvm" authors = ["Brooklyn Zelenka ", "Zeeshan Lakhani "] diff --git a/Dockerfile b/Dockerfile index 799a78f95..3ba4cc1f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,8 @@ FROM builder-$TARGETARCH as builder RUN adduser --disabled-password --disabled-login --gecos "" --no-create-home ipvm +RUN apt update && apt install -y protobuf-compiler sqlite + RUN cargo init # touch lib.rs as we combine both diff --git a/README.md b/README.md index 13d9046b4..d14bdafb7 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,8 @@ Build Status - - License-Apache - - - License-MIT + + License Docs @@ -170,12 +167,8 @@ These are references to specifications, talks and presentations, etc. ## License -This project is licensed under either of - -- Apache License, Version 2.0, ([LICENSE-APACHE](./LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) -- MIT license ([LICENSE-MIT](./LICENSE-MIT) or http://opensource.org/licenses/MIT) - -at your option. +This project is licensed under the [Apache License 2.0](./LICENSE), or +[http://www.apache.org/licenses/LICENSE-2.0][apache]. ### Contribution diff --git a/deny.toml b/deny.toml index f02330600..25b863278 100644 --- a/deny.toml +++ b/deny.toml @@ -65,15 +65,20 @@ ignore = [ # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html [licenses] # The lint level for crates which do not have a detectable license -unlicensed = "deny" +unlicensed = "warn" # List of explicitly allowed licenses # See https://spdx.org/licenses/ for list of possible licenses # [possible values: any SPDX 3.7 short identifier (+ optional exception)]. allow = [ + "0BSD", "Apache-2.0", + "Apache-2.0 WITH LLVM-exception", + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "ISC", "MIT", - "BSD-3-Clause" - + "MPL-2.0" ] # List of explicitly disallowed licenses # See https://spdx.org/licenses/ for list of possible licenses diff --git a/src/db.rs b/src/db.rs index cf5e5ef8c..d297b743d 100644 --- a/src/db.rs +++ b/src/db.rs @@ -9,5 +9,5 @@ pub fn establish_connection() -> SqliteConnection { let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set"); SqliteConnection::establish(&database_url) - .unwrap_or_else(|_| panic!("Error connecting to {}", database_url)) + .unwrap_or_else(|_| panic!("Error connecting to {database_url}")) } diff --git a/src/main.rs b/src/main.rs index c3e314b50..ceb9a49c8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -146,7 +146,7 @@ async fn main() -> Result<()> { .map(ToString::to_string) .collect(); - let resource = Url::parse(format!("ipfs://{}", wasm).as_str()).expect("IPFS URL"); + let resource = Url::parse(format!("ipfs://{wasm}").as_str()).expect("IPFS URL"); let ipld_args: Ipld = Ipld::List( wasm_args @@ -195,7 +195,7 @@ async fn main() -> Result<()> { let res_cursor = Cursor::new(res); let AddResponse { hash, .. } = ipfs.add(res_cursor).await.expect("a CID"); - println!("Result CID: {}", hash); + println!("Result CID: {hash}"); let _ = client.start_providing(closure_cid.clone()).await;