Skip to content

Commit

Permalink
Merge branch 'main' into simulation_fp_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dmkozh authored Nov 6, 2024
2 parents 942b2b1 + 1cd8b8d commit c027c86
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 25 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ jobs:
# temporarily disabling publish-dry-run, it appears to be broken with recent
# changes to dependency specifications?
# needs: [fmt, cackle, cargo-deny, check-git-rev-deps, build-and-test, publish-dry-run]
# needs: [fmt, cackle, cargo-deny, check-git-rev-deps, semver-checks, build-and-test]
# semver-checks is currently broken due to incompatible `arbitrary` crate
# update (https://github.com/rust-fuzz/arbitrary/issues/203).
# TODO: re-enable this as soon as the check has been fixed.
needs: [fmt, cackle, cargo-deny, check-git-rev-deps, build-and-test]
needs: [fmt, cackle, cargo-deny, check-git-rev-deps, semver-checks, build-and-test]
runs-on: ubuntu-latest
steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
Expand Down
24 changes: 12 additions & 12 deletions Cargo.lock

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

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ exclude = ["soroban-test-wasms/wasm-workspace"]
# NB: When bumping the major version make sure to clean up the
# code guarded by `unstable-*` features to make it enabled
# unconditionally.
version = "22.0.0-rc.3"
version = "22.0.0"
rust-version = "1.79.0"

[workspace.dependencies]
soroban-env-common = { version = "=22.0.0-rc.3", path = "soroban-env-common", default-features = false }
soroban-env-guest = { version = "=22.0.0-rc.3", path = "soroban-env-guest" }
soroban-env-host = { version = "=22.0.0-rc.3", path = "soroban-env-host" }
soroban-env-macros = { version = "=22.0.0-rc.3", path = "soroban-env-macros" }
soroban-builtin-sdk-macros = { version = "=22.0.0-rc.3", path = "soroban-builtin-sdk-macros" }
soroban-env-common = { version = "=22.0.0", path = "soroban-env-common", default-features = false }
soroban-env-guest = { version = "=22.0.0", path = "soroban-env-guest" }
soroban-env-host = { version = "=22.0.0", path = "soroban-env-host" }
soroban-env-macros = { version = "=22.0.0", path = "soroban-env-macros" }
soroban-builtin-sdk-macros = { version = "=22.0.0", path = "soroban-builtin-sdk-macros" }
# NB: this must match the wasmparser version wasmi is using
wasmparser = "=0.116.1"

# NB: When updating, also update the version in rs-soroban-env dev-dependencies
[workspace.dependencies.stellar-xdr]
version = "=22.0.0-rc.1.1"
version = "=22.0.0"
#git = "https://github.com/stellar/rs-stellar-xdr"
#rev = "67be5955a15f1d3a4df83fe86e6ae107f687141b"
default-features = false
Expand Down
2 changes: 1 addition & 1 deletion soroban-env-host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ k256 = {version = "0.13.1", default-features = false, features = ["alloc"]}
p256 = {version = "0.13.2", default-features = false, features = ["alloc"]}

[dev-dependencies.stellar-xdr]
version = "=22.0.0-rc.1.1"
version = "=22.0.0"
#git = "https://github.com/stellar/rs-stellar-xdr"
#rev = "67be5955a15f1d3a4df83fe86e6ae107f687141b"
default-features = false
Expand Down

0 comments on commit c027c86

Please sign in to comment.