Skip to content

Commit

Permalink
ci: use env.RUST_MSRV in msrv checks
Browse files Browse the repository at this point in the history
  • Loading branch information
dj8yf0μl committed Oct 22, 2024
1 parent 3884ecd commit 60be55a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ jobs:
run: sudo apt-get update && sudo apt-get install --assume-yes libudev-dev

- name: Cargo check
env:
# info: (overridden by '/home/runner/work/cargo-near/cargo-near/rust-toolchain.toml')
RUSTUP_TOOLCHAIN: ${{ env.RUST_MSRV }}
run: |
rustc -vV
cargo check -p cargo-near
cargo check -p cargo-near-build --all-features
Expand All @@ -56,9 +60,9 @@ jobs:
- name: "Install stable Rust toolchain"
uses: actions-rs/toolchain@v1
with:
profile: minimal
# channel is really controlled by ./rust-toolchain.toml
toolchain: stable
default: true
profile: minimal

- name: Install `wasm32-unknown-unknown`
run: rustup target add wasm32-unknown-unknown
Expand Down
2 changes: 1 addition & 1 deletion cargo-near/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "cargo-near"
version = "0.10.1"
authors = ["Near Inc <[email protected]>"]
edition = "2021"
rust-version = "1.78.0"
rust-version = "1.79.0"
description = "Cargo extension for building Rust smart contracts on NEAR"
readme = "README.md"
repository = "https://github.com/near/cargo-near"
Expand Down
2 changes: 1 addition & 1 deletion cargo-near/src/commands/new/test_basics_on.rs.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
async fn test_basics_on(contract_wasm: &[u8]) -> Result<(), Box<dyn std::error::Error>> {
let sandbox = near_workspaces::sandbox().await?;
let contract = sandbox.dev_deploy(&contract_wasm).await?;
let contract = sandbox.dev_deploy(contract_wasm).await?;

let user_account = sandbox.dev_create_account().await?;

Expand Down
1 change: 0 additions & 1 deletion integration-tests/tests/cargo_near_new.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ async fn test_docker_build() -> Result<(), Box<dyn std::error::Error>> {

let artifact = cargo_near_build::docker::build(opts)?;


let contract_wasm = std::fs::read(artifact.path)?;

test_basics_on(&contract_wasm).await?;
Expand Down

0 comments on commit 60be55a

Please sign in to comment.