Skip to content

Commit

Permalink
chore: fix builds/etc
Browse files Browse the repository at this point in the history
  • Loading branch information
zeeshanlakhani committed Dec 16, 2022
1 parent f841c64 commit 985ecf1
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Default
* @expede
* @expede @zeeshanlakhani
5 changes: 5 additions & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/tests_and_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- stable
- nightly
# minimum version
- 1.64
- 1.65
steps:
- name: Install Protoc
uses: arduino/setup-protoc@v1
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>", "Zeeshan Lakhani <[email protected]>"]
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 4 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
<a href="https://github.com/ipvm-wg/ipvm/actions?query=">
<img src="https://github.com/ipvm-wg/ipvm/actions/workflows/tests_and_checks.yml/badge.svg" alt="Build Status">
</a>
<a href="https://github.com/ipvm-wg/ipvm/blob/main/LICENSE-APACHE">
<img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" alt="License-Apache">
</a>
<a href="https://github.com/ipvm-wg/ipvm/blob/main/LICENSE-MIT">
<img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="License-MIT">
<a href="https://github.com/ipvm-wg/ipvm/blob/main/LICENSE">
<img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" alt="License">
</a>
<a href="https://docs.rs/ipvm">
<img src="https://img.shields.io/static/v1?label=Docs&message=docs.rs&color=blue" alt="Docs">
Expand Down Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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}"))
}
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 985ecf1

Please sign in to comment.