Merge branch 'main' into main

stellar · May 16, 2024 · 113e907 · 113e907
2 parents 37fdd35 + 4bb5f9b
commit 113e907
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -84,13 +84,12 @@ jobs:
           - 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
+          - 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

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
 default-members = ["cmd/crates/stellar-rpc-client"]
 
 [workspace.package]
-version = "21.1.0"
+version = "21.2.0"
 rust-version = "1.74.0"
 
 [workspace.dependencies.soroban-env-host]

diff --git a/cmd/soroban-rpc/lib/preflight/Cargo.toml b/cmd/soroban-rpc/lib/preflight/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "preflight"
-version = "21.1.0"
+version = "21.2.0"
 publish = false
 
 [lib]