Skip to content

Commit

Permalink
Bump version to 21.0.1 (#158)
Browse files Browse the repository at this point in the history
---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Alfonso Acosta <alfonso@stellar.org>
  • Loading branch information
3 people committed Apr 24, 2024
1 parent 5c6d657 commit 87bf642
Show file tree
Hide file tree
Showing 6 changed files with 165 additions and 167 deletions.
149 changes: 75 additions & 74 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Rust

on:
push:
branches: [main, release/**]
branches: [ main, release/** ]
pull_request:

defaults:
Expand All @@ -13,100 +13,101 @@ jobs:

complete:
if: always()
needs: [fmt, build-and-test, publish-dry-run]
needs: [ fmt, build-and-test, publish-dry-run ]
runs-on: ubuntu-latest
steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1

fmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: rustup update
- run: cargo fmt --all --check
- uses: actions/checkout@v3
- run: rustup update
- run: cargo fmt --all --check

build-and-test:
strategy:
fail-fast: false
matrix:
rust: [msrv, latest]
rust: [ msrv, latest ]
include:
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
- os: ubuntu-latest
target: aarch64-unknown-linux-gnu
- os: macos-latest
target: x86_64-apple-darwin
- os: macos-latest
target: aarch64-apple-darwin
- os: windows-latest-8-cores
target: x86_64-pc-windows-msvc
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
- os: ubuntu-latest
target: aarch64-unknown-linux-gnu
- os: macos-latest
target: x86_64-apple-darwin
- os: macos-latest
target: aarch64-apple-darwin
- os: windows-latest-8-cores
target: x86_64-pc-windows-msvc
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: stellar/actions/rust-cache@main
- name: Use the minimum supported Rust version
if: matrix.rust == 'msrv'
run: |
msrv="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages | map(.rust_version) | map(values) | min')"
rustup override set $msrv
rustup component add clippy --toolchain $msrv
- name: Error on warnings and clippy checks
# Only error on warnings and checks for the msrv, because new versions of
# Rust will frequently add new warnings and checks.
if: matrix.rust == 'msrv'
run: echo RUSTFLAGS='-Dwarnings -Dclippy::all -Dclippy::pedantic' >> $GITHUB_ENV
- run: rustup update
- run: cargo version
- run: rustup target add ${{ matrix.target }}
- run: rustup target add wasm32-unknown-unknown
- if: matrix.target == 'aarch64-unknown-linux-gnu'
run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
- run: cargo clippy --all-targets --target ${{ matrix.target }}
- run: make build-test
- if: startsWith(matrix.target, 'x86_64')
# specify directories explicitly to avoid building the preflight library (otherwise it will fail with missing symbols)
run: |
for I in cmd/crates/* ; do
cargo test --target ${{ matrix.target }} --manifest-path $I/Cargo.toml
done
- uses: actions/checkout@v3
- uses: stellar/actions/rust-cache@main
- name: Use the minimum supported Rust version
if: matrix.rust == 'msrv'
run: |
msrv="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages | map(.rust_version) | map(values) | min')"
rustup override set $msrv
rustup component add clippy --toolchain $msrv
- name: Error on warnings and clippy checks
# Only error on warnings and checks for the msrv, because new versions of
# Rust will frequently add new warnings and checks.
if: matrix.rust == 'msrv'
run: echo RUSTFLAGS='-Dwarnings -Dclippy::all -Dclippy::pedantic' >> $GITHUB_ENV
- run: rustup update
- run: cargo version
- run: rustup target add ${{ matrix.target }}
- run: rustup target add wasm32-unknown-unknown
- if: matrix.target == 'aarch64-unknown-linux-gnu'
run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
- run: cargo clippy --all-targets --target ${{ matrix.target }}
- run: make build-test
- if: startsWith(matrix.target, 'x86_64')
# specify directories explicitly to avoid building the preflight library (otherwise it will fail with missing symbols)
run: |
for I in cmd/crates/* ; do
cargo test --target ${{ matrix.target }} --manifest-path $I/Cargo.toml
done
publish-dry-run:
if: github.event_name == 'push' || startsWith(github.head_ref, 'release/')
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
cargo-hack-feature-options: --feature-powerset
- os: ubuntu-latest
target: aarch64-unknown-linux-gnu
cargo-hack-feature-options: --feature-powerset
- os: macos-latest
target: x86_64-apple-darwin
cargo-hack-feature-options: --feature-powerset
- os: macos-latest
target: aarch64-apple-darwin
cargo-hack-feature-options: --feature-powerset
# Windows builds notes:
#
# The different features that need testing are split over unique
# isolated builds for Windows, because there's a bug in Cargo [1] that
# causes builds of wasm-opt [2] to fail when run one after the other and
# attempting to clean up artifacts in between. The bug has been fixed,
# but will not make it into a stable release of Cargo until ~August
# 2023.
#
# [1]: https://github.com/rust-lang/cargo/pull/11442
# [2]: https://github.com/brson/wasm-opt-rs/issues/116
- os: windows-latest-8-cores
target: x86_64-pc-windows-msvc
cargo-hack-feature-options: ''
- os: windows-latest-8-cores
target: x86_64-pc-windows-msvc
cargo-hack-feature-options: --features opt --ignore-unknown-features
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
cargo-hack-feature-options: --feature-powerset
- os: ubuntu-latest
target: aarch64-unknown-linux-gnu
cargo-hack-feature-options: --feature-powerset
# TODO: uncomment once this is resolved https://github.com/actions/runner-images/issues/9734#issuecomment-2074746599
# - os: macos-latest
# target: x86_64-apple-darwin
# cargo-hack-feature-options: --feature-powerset
# - os: macos-latest
# target: aarch64-apple-darwin
# cargo-hack-feature-options: --feature-powerset
# Windows builds notes:
#
# The different features that need testing are split over unique
# isolated builds for Windows, because there's a bug in Cargo [1] that
# causes builds of wasm-opt [2] to fail when run one after the other and
# attempting to clean up artifacts in between. The bug has been fixed,
# but will not make it into a stable release of Cargo until ~August
# 2023.
#
# [1]: https://github.com/rust-lang/cargo/pull/11442
# [2]: https://github.com/brson/wasm-opt-rs/issues/116
- os: windows-latest-8-cores
target: x86_64-pc-windows-msvc
cargo-hack-feature-options: ''
- os: windows-latest-8-cores
target: x86_64-pc-windows-msvc
cargo-hack-feature-options: --features opt --ignore-unknown-features
uses: stellar/actions/.github/workflows/rust-publish-dry-run-v2.yml@main
with:
crates: stellar-rpc-client
Expand Down
52 changes: 26 additions & 26 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,35 @@ default-members = ["cmd/crates/stellar-rpc-client"]
#exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]

[workspace.package]
version = "21.0.0"
version = "21.0.1"
rust-version = "1.74.0"

[workspace.dependencies.soroban-env-host]
version = "=21.0.0"
version = "=21.0.1"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "27897f6073aec5241d3486690a33b22c80dd0718"
# path = "../rs-soroban-env/soroban-env-host"

[workspace.dependencies.soroban-simulation]
version = "=21.0.0"
version = "=21.0.1"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "27897f6073aec5241d3486690a33b22c80dd0718"
# path = "../rs-soroban-env/soroban-simulation"

[workspace.dependencies.soroban-spec]
version = "=21.0.0"
version = "=21.0.1-preview.1"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3"
# path = "../rs-soroban-sdk/soroban-spec"

[workspace.dependencies.soroban-sdk]
version = "=21.0.0"
version = "=21.0.1-preview.1"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "c30bc769e379bef9b94a3ceb464aa78c1185eeb3"


[workspace.dependencies.stellar-xdr]
version = "=21.0.0"
version = "=21.0.1"
default-features = true
# git = "https://github.com/stellar/rs-stellar-xdr"
# rev = "a80c899c61e869fd00b7b475a4947ab6aaf9dcac"
Expand Down
2 changes: 1 addition & 1 deletion cmd/soroban-rpc/lib/preflight/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "preflight"
version = "21.0.0"
version = "21.0.1"
publish = false

[lib]
Expand Down

0 comments on commit 87bf642

Please sign in to comment.