Skip to content

Commit

Permalink
Remove pin of nightly version for nightly builds (#1387)
Browse files Browse the repository at this point in the history
### What
Remove pin of nightly version for nightly builds.

### Why
The underlying issue for why the version pinning was required has been
fixed:
- rust-lang/rust#132427
  • Loading branch information
leighmcculloch authored Nov 6, 2024
1 parent fc32690 commit 2e2673e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: stellar/actions/rust-cache@main
# TODO: Unpin nightly version after https://github.com/rust-lang/rust/issues/131643 is fixed.
- run: rustup install nightly-2024-10-10
- run: rustup install nightly
- uses: stellar/binaries@v15
with:
name: cargo-fuzz
Expand All @@ -152,8 +151,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: stellar/actions/rust-cache@main
# TODO: Unpin nightly version after https://github.com/rust-lang/rust/issues/131643 is fixed.
- run: rustup install nightly-2024-10-10
- run: rustup install nightly
- run: make doc
- name: Check no diffs exist
run: git add -N . && git diff HEAD --exit-code
Expand All @@ -163,8 +161,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: stellar/actions/rust-cache@main
# TODO: Unpin nightly version after https://github.com/rust-lang/rust/issues/131643 is fixed.
- run: rustup install nightly-2024-10-10
- run: rustup install nightly
- run: make readme
- run: git add -N . && git diff HEAD --exit-code

Expand Down
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ CARGO_DOC_ARGS?=--open

doc: fmt
cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils,hazmat
# TODO: Unpin nightly version after https://github.com/rust-lang/rust/issues/131643 is fixed.
cargo +nightly-2024-10-10 doc -p soroban-sdk --no-deps --all-features $(CARGO_DOC_ARGS)
cargo +nightly doc -p soroban-sdk --no-deps --all-features $(CARGO_DOC_ARGS)

test: fmt build
cargo hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test
Expand All @@ -24,13 +23,11 @@ check: build fmt
cargo hack check --release --target wasm32-unknown-unknown

build-fuzz:
# TODO: Unpin nightly version after https://github.com/rust-lang/rust/issues/131643 is fixed.
cd tests/fuzz/fuzz && cargo +nightly-2024-10-10 fuzz check
cd tests/fuzz/fuzz && cargo +nightly fuzz check

readme:
# TODO: Unpin nightly version after https://github.com/rust-lang/rust/issues/131643 is fixed.
cd soroban-sdk \
&& cargo +nightly-2024-10-10 rustdoc -- -Zunstable-options -wjson \
&& cargo +nightly rustdoc -- -Zunstable-options -wjson \
&& cat ../target/doc/soroban_sdk.json \
| jq -r '.index[.root|tostring].docs' \
> README.md
Expand Down

0 comments on commit 2e2673e

Please sign in to comment.