Skip to content

Commit

Permalink
Merge branch 'main' into dependabot
Browse files Browse the repository at this point in the history
  • Loading branch information
berendsliedrecht authored May 22, 2024
2 parents ffb7d2e + 81a925b commit 8c38799
Show file tree
Hide file tree
Showing 34 changed files with 1,966 additions and 486 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,10 @@ jobs:
name: Build library (iOS)
needs: [checks]
runs-on: macos-latest

env:
FEATURES: "mobile_secure_element"

strategy:
matrix:
target: [aarch64-apple-ios, aarch64-apple-ios-sim, x86_64-apple-ios]
Expand All @@ -412,7 +416,7 @@ jobs:

- name: Build
run: |
cargo build --lib --release --target ${{matrix.target}}
cargo build --lib --release --target ${{matrix.target}} --features ${{ env.FEATURES }}
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand All @@ -423,8 +427,10 @@ jobs:
build-android:
name: Build library (Android)
needs: [checks]

env:
RUST_VERSION: "1.67"
FEATURES: "mobile_secure_element"

runs-on: ubuntu-latest

Expand Down Expand Up @@ -461,7 +467,7 @@ jobs:
if [ "${{ matrix.target }}" = "aarch64-linux-android" ]; then
export CFLAGS="-D__ARM_ARCH=8"
fi
cross build --lib --release --target ${{matrix.target}}
cross build --lib --release --target ${{matrix.target}} --features ${{ env.FEATURES }}
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand Down
Loading

0 comments on commit 8c38799

Please sign in to comment.