Skip to content

Commit

Permalink
ci: update to 1.78, use explicit toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
bitwalker committed Aug 9, 2024
1 parent 9c6a3ee commit f266e4b
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- main
pull_request:
types: [opened, repoened, synchronize]
types: [opened, reopened, synchronize]

jobs:
test:
Expand Down
16 changes: 10 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
[workspace]
members = [
"air-script",
"parser",
"pass",
"ir",
"codegen/masm",
"codegen/winterfell",
"air-script",
"parser",
"pass",
"ir",
"codegen/masm",
"codegen/winterfell",
]
resolver = "2"

[workspace.package]
edition = "2021"
rust-version = "1.78"
6 changes: 3 additions & 3 deletions air-script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ repository = "https://github.com/0xPolygonMiden/air-script"
documentation = "https://0xpolygonmiden.github.io/air-script/"
categories = ["compilers", "cryptography"]
keywords = ["air", "stark", "zero-knowledge", "zkp"]
edition = "2021"
rust-version = "1.67"
edition.workspace = true
rust-version.workspace = true

[[bin]]
name = "airc"
Expand All @@ -22,7 +22,7 @@ air-parser = { package = "air-parser", path = "../parser", version = "0.4" }
air-pass = { package = "air-pass", path = "../pass", version = "0.1" }
air-codegen-masm = { package = "air-codegen-masm", path = "../codegen/masm", version = "0.4" }
air-codegen-winter = { package = "air-codegen-winter", path = "../codegen/winterfell", version = "0.4" }
clap = {version = "4.2", features = ["derive"] }
clap = { version = "4.2", features = ["derive"] }
env_logger = "0.10"
log = { version = "0.4", default-features = false }
miden-diagnostics = "0.1"
Expand Down
8 changes: 5 additions & 3 deletions codegen/masm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = "MIT"
repository = "https://github.com/0xPolygonMiden/air-script"
categories = ["compilers", "cryptography"]
keywords = ["air", "stark", "winterfell", "zero-knowledge", "zkp"]
edition = "2021"
rust-version = "1.67"
edition.workspace = true
rust-version.workspace = true

[dependencies]
air-ir = { package = "air-ir", path = "../../ir", version = "0.4" }
Expand All @@ -22,6 +22,8 @@ winter-math = { package = "winter-math", version = "0.6", default-features = fal
air-parser = { path = "../../parser" }
air-pass = { path = "../../pass" }
miden-assembly = { package = "miden-assembly", version = "0.6", default-features = false }
miden-processor = { package = "miden-processor", version = "0.6", features = ["internals"], default-features = false }
miden-processor = { package = "miden-processor", version = "0.6", features = [
"internals",
], default-features = false }
miden-diagnostics = "0.1"
winter-air = { package = "winter-air", version = "0.6", default-features = false }
4 changes: 2 additions & 2 deletions codegen/winterfell/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = "MIT"
repository = "https://github.com/0xPolygonMiden/air-script"
categories = ["compilers", "cryptography"]
keywords = ["air", "stark", "winterfell", "zero-knowledge", "zkp"]
edition = "2021"
rust-version = "1.67"
edition.workspace = true
rust-version.workspace = true

[dependencies]
air-ir = { package = "air-ir", path = "../../ir", version = "0.4" }
Expand Down
4 changes: 2 additions & 2 deletions ir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = "MIT"
repository = "https://github.com/0xPolygonMiden/air-script"
categories = ["compilers", "cryptography"]
keywords = ["air", "stark", "zero-knowledge", "zkp"]
edition = "2021"
rust-version = "1.67"
rust-version.workspace = true
edition.workspace = true

[dependencies]
air-parser = { package = "air-parser", path = "../parser", version = "0.4" }
Expand Down
4 changes: 2 additions & 2 deletions parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = "MIT"
repository = "https://github.com/0xPolygonMiden/air-script"
categories = ["compilers", "cryptography", "parser-implementations"]
keywords = ["air", "stark", "zero-knowledge", "zkp"]
edition = "2021"
rust-version = "1.67"
rust-version.workspace = true
edition.workspace = true

[build-dependencies]
lalrpop = { version = "0.20", default-features = false }
Expand Down
5 changes: 5 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[toolchain]
channel = "1.78"
components = ["rustfmt", "rust-src", "clippy"]
targets = ["wasm32-unknown-unknown"]
profile = "minimal"

0 comments on commit f266e4b

Please sign in to comment.