Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: use global workspace version #1102

Merged
merged 7 commits into from
Jul 16, 2024
Merged

ci: use global workspace version #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ff3072f
ci: use global workspace version
mattstam Jul 15, 2024
437fcad
add repository, keywords, categories
mattstam Jul 15, 2024
ede01ad
cleanup
mattstam Jul 15, 2024
49dc88d
cleanup
mattstam Jul 15, 2024
62f5bba
fix recursion/gnark-cli/Cargo.toml workspace
mattstam Jul 15, 2024
d4ae56e
fix recursion/gnark-cli
mattstam Jul 15, 2024
5fd443e
fix recursion/gnark-cli Dockerfile
mattstam Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ members = [
"recursion/circuit",
"recursion/compiler",
"recursion/core",
"recursion/gnark-cli",
"recursion/gnark-ffi",
"recursion/program",
"sdk",
Expand All @@ -19,6 +20,14 @@ members = [
exclude = ["examples/target"]
resolver = "2"

[workspace.package]
version = "0.0.2-test"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/succinctlabs/sp1"
keywords = ["sp1", "succinct", "zero-knowledge", "zkvm"]
categories = ["cryptography"]

[profile.release]
opt-level = 3

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.gnark-ffi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ WORKDIR /sp1/recursion/gnark-cli

RUN \
--mount=type=cache,target=target \
cargo build --release && cp target/release/sp1-recursion-gnark-cli /gnark-cli
cargo build --release && cp ../../target/release/sp1-recursion-gnark-cli /gnark-cli
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: this is required for putting recursion/gnark-cli in workspace


FROM rustlang/rust:nightly-bullseye-slim
COPY --from=rust-builder /gnark-cli /gnark-cli
Expand Down
9 changes: 6 additions & 3 deletions build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "sp1-build"
version = "0.0.2-test"
edition = "2021"
description = "Build an SP1 program."
license = "MIT OR Apache-2.0"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
keywords = { workspace = true }
categories = { workspace = true }

[dependencies]
cargo_metadata = "0.18.1"
Expand Down
9 changes: 6 additions & 3 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[package]
name = "sp1-cli"
version = "0.0.2-test"
edition = "2021"
description = "SP1 is a performant, 100% open-source, contributor-friendly zkVM."
readme = "../README.md"
license = "MIT OR Apache-2.0"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
keywords = { workspace = true }
categories = { workspace = true }

[build-dependencies]
vergen = { version = "8", default-features = false, features = [
Expand Down
10 changes: 6 additions & 4 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
[package]
name = "sp1-core"
version = "0.0.2-test"
edition = "2021"
description = "SP1 is a performant, 100% open-source, contributor-friendly zkVM."
readme = "../README.md"
license = "MIT OR Apache-2.0"

version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
keywords = { workspace = true }
categories = { workspace = true }

[dependencies]
bincode = "1.3.3"
Expand Down
9 changes: 6 additions & 3 deletions derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[package]
name = "sp1-derive"
version = "0.0.2-test"
edition = "2021"
description = "SP1 is a performant, 100% open-source, contributor-friendly zkVM."
readme = "../README.md"
license = "MIT OR Apache-2.0"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
keywords = { workspace = true }
categories = { workspace = true }

[lib]
proc-macro = true
Expand Down
9 changes: 6 additions & 3 deletions eval/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[package]
name = "sp1-eval"
version = "0.0.2-test"
edition = "2021"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
keywords = { workspace = true }
categories = { workspace = true }
publish = false


[dependencies]
sp1-core = { path = "../core", version = "0.0.2-test" }
sp1-prover = { path = "../prover", version = "0.0.2-test" }
Expand Down
Loading
Loading