Skip to content

Commit

Permalink
deps: Upgrade to Rust v1.64. (#327)
Browse files Browse the repository at this point in the history
* Update to rust 1.64.

* Use workspace deps.
  • Loading branch information
milesj committed Sep 26, 2022
1 parent 4932431 commit d565a33
Show file tree
Hide file tree
Showing 23 changed files with 35 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/moon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
restore-keys: ${{ runner.os }}-moon-node@${{ matrix.node-version }}-
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.63.0
toolchain: 1.64.0
profile: minimal
- uses: moonrepo/tool-version-action@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions-rs/toolchain@v1
name: Setup toolchain
with:
toolchain: 1.63.0
toolchain: 1.64.0
profile: minimal
components: rustfmt
- uses: actions-rs/cargo@v1
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- uses: actions-rs/toolchain@v1
name: Setup toolchain
with:
toolchain: 1.63.0
toolchain: 1.64.0
profile: minimal
components: clippy
- uses: actions-rs/cargo@v1
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- uses: actions-rs/toolchain@v1
name: Setup toolchain
with:
toolchain: 1.63.0
toolchain: 1.64.0
profile: minimal
components: llvm-tools-preview
- uses: actions-rs/cargo@v1
Expand Down
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
resolver = "2"
members = ["crates/*"]
default-members = ["crates/cli"]

[workspace.dependencies]
thiserror = "1.0.35"
tokio = { version = "1.21.1", features = ["full"] }
4 changes: 2 additions & 2 deletions crates/action-runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ moon_workspace = { path = "../workspace" }
console = "0.15.1"
petgraph = "0.6.2"
serde = { version = "1.0.144", features = ["derive"] }
thiserror = "1.0.35"
tokio = { version = "1.21.1", features = ["full"] }
thiserror = { workspace = true }
tokio = { workspace = true }

[dev-dependencies]
moon_cache = { path = "../cache" }
Expand Down
2 changes: 1 addition & 1 deletion crates/archive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ moon_logger = { path = "../logger" }
moon_utils = { path = "../utils" }
flate2 = "1.0.24"
tar = "0.4.38"
thiserror = "1.0.35"
thiserror = { workspace = true }
zip = "0.6.2"
2 changes: 1 addition & 1 deletion crates/cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ serde = { version = "1.0.144", features = ["derive"] }
[dev-dependencies]
assert_fs = "1.0.7"
filetime = "0.2.17"
tokio = { version = "1.21.1", features = ["test-util"] }
tokio = { workspace = true, features = ["test-util"] }
serial_test = "0.9.0"
2 changes: 1 addition & 1 deletion crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ serde_json = "1.0.85"
serde_yaml = "0.9.11"
strum = { version = "0.24.1", features = ["derive"] }
tera = { version = "1.17.0", features = ["preserve_order"] }
tokio = { version = "1.21.1", features = ["full"] }
tokio = { workspace = true }

[dev-dependencies]
moon_cache = { path = "../cache" }
Expand Down
4 changes: 2 additions & 2 deletions crates/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ serde = { version = "1.0.144", features = ["derive"] }
serde_json = { version = "1.0.85", features = ["preserve_order"] }
serde_yaml = "0.9.11"
strum = { version = "0.24.1", features = ["derive"] }
thiserror = "1.0.35"
thiserror = { workspace = true }
validator = { version = "0.16.0", features = ["derive"] }
yaml-rust = "0.4.5"

[dev-dependencies]
assert_fs = "1.0.7"
pretty_assertions = "1.3.0"
tokio = { version = "1.21.1", features = ["test-util"] }
tokio = { workspace = true, features = ["test-util"] }
2 changes: 1 addition & 1 deletion crates/error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ edition = "2021"
regex = "1.6.0"
serde_json = { version = "1.0.85", default-features = false }
serde_yaml = { version = "0.9.11", default-features = false }
thiserror = "1.0.35"
thiserror = { workspace = true }
4 changes: 2 additions & 2 deletions crates/generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ futures = "0.3.24"
lazy_static = "1.4.0"
serde_json = "1.0.85"
tera = { version = "1.17.0", features = ["preserve_order"] }
thiserror = "1.0.35"
thiserror = { workspace = true }

[dev-dependencies]
assert_fs = "1.0.7"
tokio = { version = "1.21.1", features = ["test-util"] }
tokio = { workspace = true, features = ["test-util"] }
2 changes: 1 addition & 1 deletion crates/lang-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ assert_fs = "1.0.7"
pretty_assertions = "1.3.0"
reqwest = { version = "0.11.11", features = ["blocking"] }
serial_test = "0.9.0"
tokio = { version = "1.21.1", features = ["test-util"] }
tokio = { workspace = true, features = ["test-util"] }
2 changes: 1 addition & 1 deletion crates/lang/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "0.1.0"
edition = "2021"

[dependencies]
thiserror = "1.0.35"
thiserror = { workspace = true }
2 changes: 1 addition & 1 deletion crates/platform-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ moon_utils = { path = "../utils" }
moon_workspace = { path = "../workspace" }
lazy_static = "1.4.0"
serde = { version = "1.0.144", features = ["derive"] }
tokio = { version = "1.21.1", features = ["full"] }
tokio = { workspace = true }

[dev-dependencies]
moon_cache = { path = "../cache" }
Expand Down
4 changes: 2 additions & 2 deletions crates/project-graph/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ moon_project = { path = "../project" }
moon_task = { path = "../task" }
moon_utils = { path = "../utils" }
petgraph = "0.6.2"
thiserror = "1.0.35"
thiserror = { workspace = true }

[dev-dependencies]
moon_platform_node = { path = "../platform-node" }
insta = "1.19.1"
tokio = { version = "1.21.1", features = ["test-util"] }
tokio = { workspace = true, features = ["test-util"] }
2 changes: 1 addition & 1 deletion crates/project/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ moon_task = { path = "../task" }
moon_utils = { path = "../utils" }
serde = { version = "1.0.144", features = ["derive"] }
strum = { version = "0.24.1", features = ["derive"] }
thiserror = "1.0.35"
thiserror = { workspace = true }

[dev-dependencies]
pretty_assertions = "1.3.0"
2 changes: 1 addition & 1 deletion crates/task/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ moon_utils = { path = "../utils" }
common-path = "1.0.0"
dotenvy = "0.15.3"
serde = { version = "1.0.144", features = ["derive"] }
thiserror = "1.0.35"
thiserror = { workspace = true }
4 changes: 2 additions & 2 deletions crates/toolchain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ moon_utils = { path = "../utils" }
async-trait = "0.1.57"
reqwest = { version = "0.11.11", features = ["native-tls-vendored"] }
sha2 = "0.10.5"
thiserror = "1.0.35"
thiserror = { workspace = true }

[dev-dependencies]
assert_fs = "1.0.7"
mockito = "0.31.0"
predicates = "2.1.1"
tokio = { version = "1.21.1", features = ["test-util"] }
tokio = { workspace = true, features = ["test-util"] }
2 changes: 1 addition & 1 deletion crates/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ semver = "1.0.13"
serde = "1.0.144"
serde_json = { version = "1.0.85", features = ["preserve_order"] }
shell-words = "1.1.0"
tokio = { version = "1.21.1", features = ["full"] }
tokio = { workspace = true }
wax = "0.5.0"

4 changes: 2 additions & 2 deletions crates/vcs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ moon_utils = { path = "../utils" }
async-trait = "0.1.57"
ignore = "0.4.18"
regex = "1.6.0"
thiserror = "1.0.35"
tokio = "1.21.1"
thiserror = { workspace = true }
tokio = { workspace = true }
4 changes: 2 additions & 2 deletions crates/workspace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ moon_project_graph = { path = "../project-graph" }
moon_toolchain = { path = "../toolchain" }
moon_utils = { path = "../utils" }
moon_vcs = { path = "../vcs" }
thiserror = "1.0.35"
tokio = { version = "1.21.1", features = ["full"] }
thiserror = { workspace = true }
tokio = { workspace = true }
1 change: 1 addition & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#### ⚙️ Internal

- Updated Rust to v1.64.
- Windows:
- Will always use PowerShell and avoids `cmd.exe` entirely.
- Reworked commands that run through PowerShell to pass arguments via stdin.
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
# https://rust-lang.github.io/rustup/concepts/profiles.html
profile = "default"
channel = "1.63.0"
channel = "1.64.0"
2 changes: 1 addition & 1 deletion scripts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# glibc

FROM rust:1.63.0 AS base-gnu
FROM rust:1.64.0 AS base-gnu
RUN cargo install cargo-chef --version ^0.1
WORKDIR /app
COPY .cargo .cargo
Expand Down

0 comments on commit d565a33

Please sign in to comment.