Merge branch 'main' into add-keccak256-and-secp256k1

stellar · Sep 9, 2023 · 452d184 · 452d184
2 parents 328af12 + 1def3c6
commit 452d184
Show file tree

Hide file tree

Showing 69 changed files with 1,228 additions and 592 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [main, release/**]
   pull_request:
+  merge_group:
 
 env:
   RUSTFLAGS: -D warnings
@@ -16,7 +17,7 @@ jobs:
 
   complete:
     if: always()
-    needs: [fmt, rust-analyzer-compat, build-and-test, docs]
+    needs: [fmt, check-git-rev-deps, rust-analyzer-compat, build-and-test, docs]
     runs-on: ubuntu-latest
     steps:
     - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
@@ -44,6 +45,12 @@ jobs:
       with:
         command: check ${{ matrix.checks }}
 
+  check-git-rev-deps:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: stellar/actions/rust-check-git-rev-deps@main
+
   rust-analyzer-compat:
     runs-on: ubuntu-latest
     steps:
@@ -60,10 +67,14 @@ jobs:
         sys:
         - os: ubuntu-latest
           target: x86_64-unknown-linux-gnu
-        # TODO: Figure out why builds are broken for linux arm64 and reenable.
-        # https://github.com/stellar/rs-soroban-sdk/issues/1011
-        # - os: ubuntu-latest
-        #   target: aarch64-unknown-linux-gnu
+        - os: ubuntu-latest
+          target: aarch64-unknown-linux-gnu
+          # Fix #1011 by avoiding the use of crate-type = ["cdylib"] in native
+          # builds that cross-compile. It causes linker errors. The root cause
+          # is rust-lang/cargo#4133. This workaround uses rustc to build for a
+          # specific crate-type, lib, such that the Cargo.toml crate-type is
+          # ignored.
+          cdylib-cross-compile-workaround: true
         - os: macos-latest
           target: x86_64-apple-darwin
         - os: macos-latest
@@ -84,7 +95,10 @@ jobs:
         name: cargo-hack
         version: 0.5.16
     - run: cargo-hack hack build --target wasm32-unknown-unknown --profile release
-    - run: cargo-hack hack --feature-powerset --exclude-features docs build --target ${{ matrix.sys.target }}
+    - if: "!matrix.sys.cdylib-cross-compile-workaround"
+      run: cargo-hack hack --feature-powerset --exclude-features docs build --target ${{ matrix.sys.target }}
+    - if: "matrix.sys.cdylib-cross-compile-workaround"
+      run: cargo-hack hack --feature-powerset --exclude-features docs rustc --workspace --exclude soroban-sdk-macros --crate-type lib --target ${{ matrix.sys.target }}
     - if: startsWith(matrix.sys.target, 'x86_64')
       run: cargo-hack hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test --target ${{ matrix.sys.target }}