Skip to content

Commit

Permalink
Merge branch 'main' into read/read_contract_code
Browse files Browse the repository at this point in the history
  • Loading branch information
willemneal authored Jun 18, 2024
2 parents 74f7389 + f396c10 commit 15249ea
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 38 deletions.
21 changes: 12 additions & 9 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ jobs:
complete:
if: always()
needs: [fmt, build-and-test, publish-dry-run]
runs-on: ubuntu-latest
runs-on: ubuntu-latest-16-cores
steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1

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

check-generated-examples-list:
runs-on: ubuntu-latest
runs-on: ubuntu-latest-16-cores
steps:
- uses: actions/checkout@v4
- run: make generate-examples-list
Expand All @@ -40,9 +40,9 @@ jobs:
matrix:
rust: [msrv, latest]
include:
- os: ubuntu-latest
- os: ubuntu-latest-16-cores
target: x86_64-unknown-linux-gnu
- os: ubuntu-latest
- os: ubuntu-latest-16-cores
target: aarch64-unknown-linux-gnu
- os: macos-latest
target: x86_64-apple-darwin
Expand Down Expand Up @@ -88,12 +88,14 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
- os: ubuntu-latest-16-cores
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
additional-deb-packages: libudev-dev
# - os: ubuntu-latest-16-cores
# target: aarch64-unknown-linux-gnu
# cargo-hack-feature-options: --feature-powerset
# additional-deb-packages: libudev-dev libssl-dev
- os: macos-latest
target: x86_64-apple-darwin
cargo-hack-feature-options: --feature-powerset
Expand Down Expand Up @@ -124,3 +126,4 @@ jobs:
runs-on: ${{ matrix.os }}
target: ${{ matrix.target }}
cargo-hack-feature-options: ${{ matrix.cargo-hack-feature-options }}
additional-deb-packages: ${{ matrix.additional-deb-packages }}
28 changes: 14 additions & 14 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ default-members = ["cmd/soroban-cli", "cmd/crates/soroban-spec-tools", "cmd/crat
exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]

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

[workspace.dependencies.soroban-env-host]
Expand All @@ -27,15 +27,15 @@ version = "=21.1.0-rc.1"
version = "=21.1.0-rc.1"

[workspace.dependencies.soroban-spec-json]
version = "=21.0.0-rc.1"
version = "=21.0.0"
path = "./cmd/crates/soroban-spec-json"

[workspace.dependencies.soroban-spec-typescript]
version = "21.0.0-rc.1"
version = "21.0.0"
path = "./cmd/crates/soroban-spec-typescript"

[workspace.dependencies.soroban-spec-tools]
version = "21.0.0-rc.1"
version = "21.0.0"
path = "./cmd/crates/soroban-spec-tools"

[workspace.dependencies.soroban-sdk]
Expand All @@ -48,7 +48,7 @@ version = "=21.1.0-rc.1"
version = "=21.1.0-rc.1"

[workspace.dependencies.soroban-cli]
version = "=21.0.0-rc.1"
version = "=21.0.0"
path = "cmd/soroban-cli"

[workspace.dependencies.soroban-rpc]
Expand Down
4 changes: 2 additions & 2 deletions FULL_HELP_DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Anything after the `--` double dash (the "slop") is parsed as arguments to the c
* `xdr` — Decode and encode XDR
* `network` — Start and configure networks
* `version` — Print version information
* `cache` — Cache for tranasctions and contract specs
* `cache` — Cache for transactions and contract specs

###### **Options:**

Expand Down Expand Up @@ -1426,7 +1426,7 @@ Print version information

## `stellar cache`

Cache for tranasctions and contract specs
Cache for transactions and contract specs

**Usage:** `stellar cache <COMMAND>`

Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-test"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
version = "21.0.0-rc.1"
version = "21.0.0"
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "soroban-hello"
version = "21.0.0-rc.1"
version = "21.0.0"
edition = "2021"
publish = false

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_custom_account"
version = "21.0.0-rc.1"
version = "21.0.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_custom_types"
version = "21.0.0-rc.1"
version = "21.0.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_hello_world"
version = "21.0.0-rc.1"
version = "21.0.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion cmd/soroban-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
version = "21.0.0-rc.1"
version = "21.0.0"
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down
2 changes: 1 addition & 1 deletion cmd/soroban-cli/src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ pub enum Cmd {
Network(network::Cmd),
/// Print version information
Version(version::Cmd),
/// Cache for tranasctions and contract specs
/// Cache for transactions and contract specs
#[command(subcommand)]
Cache(cache::Cmd),
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/stellar-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
version = "21.0.0-rc.1"
version = "21.0.0"
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down

0 comments on commit 15249ea

Please sign in to comment.