Skip to content

Commit

Permalink
Merge branch 'main' into i1195
Browse files Browse the repository at this point in the history
  • Loading branch information
leighmcculloch committed Jan 11, 2024
2 parents 616fb8c + 9f955ef commit a398496
Show file tree
Hide file tree
Showing 29 changed files with 88 additions and 88 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/rust-version.yml

This file was deleted.

20 changes: 15 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
pull_request:
merge_group:

env:
RUSTFLAGS: -D warnings

defaults:
run:
shell: bash
Expand Down Expand Up @@ -78,6 +75,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [msrv, latest]
sys:
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
Expand All @@ -99,15 +97,27 @@ jobs:
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' >> $GITHUB_ENV
- run: rustup update
- run: cargo version
- run: rustup target add ${{ matrix.sys.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
- uses: stellar/binaries@v12
- uses: stellar/binaries@v18
with:
name: cargo-hack
version: 0.5.16
version: 0.5.28
- if: startsWith(matrix.sys.target, 'x86_64')
name: Clear test snapshots for checking no diffs exists after test run
run: rm -fr **/test_snapshots
Expand Down
68 changes: 34 additions & 34 deletions Cargo.lock

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

27 changes: 14 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,31 @@ members = [
]

[workspace.package]
version = "20.0.3"
version = "20.1.0"
rust-version = "1.74.0"

[workspace.dependencies]
soroban-sdk = { version = "20.0.3", path = "soroban-sdk" }
soroban-sdk-macros = { version = "20.0.3", path = "soroban-sdk-macros" }
soroban-spec = { version = "20.0.3", path = "soroban-spec" }
soroban-spec-rust = { version = "20.0.3", path = "soroban-spec-rust" }
soroban-ledger-snapshot = { version = "20.0.3", path = "soroban-ledger-snapshot" }
soroban-token-sdk = { version = "20.0.3", path = "soroban-token-sdk" }
soroban-sdk = { version = "20.1.0", path = "soroban-sdk" }
soroban-sdk-macros = { version = "20.1.0", path = "soroban-sdk-macros" }
soroban-spec = { version = "20.1.0", path = "soroban-spec" }
soroban-spec-rust = { version = "20.1.0", path = "soroban-spec-rust" }
soroban-ledger-snapshot = { version = "20.1.0", path = "soroban-ledger-snapshot" }
soroban-token-sdk = { version = "20.1.0", path = "soroban-token-sdk" }

[workspace.dependencies.soroban-env-common]
version = "=20.0.2"
version = "=20.1.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "81f6eb1eefd299af3e03fa0db7b20eb355b2b55f"
rev = "c1b238b65bfd13666be4ac14e0e390c31b549caf"

[workspace.dependencies.soroban-env-guest]
version = "=20.0.2"
version = "=20.1.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "81f6eb1eefd299af3e03fa0db7b20eb355b2b55f"
rev = "c1b238b65bfd13666be4ac14e0e390c31b549caf"

[workspace.dependencies.soroban-env-host]
version = "=20.0.2"
version = "=20.1.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "81f6eb1eefd299af3e03fa0db7b20eb355b2b55f"
rev = "c1b238b65bfd13666be4ac14e0e390c31b549caf"

[workspace.dependencies.stellar-strkey]
version = "=0.0.8"
Expand Down
2 changes: 1 addition & 1 deletion soroban-ledger-snapshot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readme = "../README.md"
license = "Apache-2.0"
version.workspace = true
edition = "2021"
rust-version = "1.74"
rust-version.workspace = true

[dependencies]
soroban-env-host = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion soroban-sdk-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readme = "../README.md"
license = "Apache-2.0"
version.workspace = true
edition = "2021"
rust-version = "1.74"
rust-version.workspace = true

[lib]
proc-macro = true
Expand Down
2 changes: 1 addition & 1 deletion soroban-sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readme = "README.md"
license = "Apache-2.0"
version.workspace = true
edition = "2021"
rust-version = "1.74"
rust-version.workspace = true

exclude = ["test_snapshots/", "src/tests/"]

Expand Down
2 changes: 1 addition & 1 deletion soroban-sdk/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1560,7 +1560,7 @@ impl internal::EnvBase for Env {
.unwrap_optimized())
}

fn symbol_new_from_slice(&self, slice: &str) -> Result<SymbolObject, Self::Error> {
fn symbol_new_from_slice(&self, slice: &[u8]) -> Result<SymbolObject, Self::Error> {
Ok(self
.env_impl
.symbol_new_from_slice(slice)
Expand Down
Loading

0 comments on commit a398496

Please sign in to comment.