Skip to content

Commit

Permalink
Merge pull request #312 from andrewwhitehead/upd/deps-2
Browse files Browse the repository at this point in the history
Update Rust dependencies and versions
  • Loading branch information
andrewwhitehead authored Nov 25, 2024
2 parents 3a4d504 + f91ef0d commit ec57eb2
Show file tree
Hide file tree
Showing 12 changed files with 648 additions and 572 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "Aries-Askar"

env:
RUST_VERSION: "1.70.0"
RUST_VERSION: "1.74.0"
CROSS_VERSION: "0.2.4"
TEST_FEATURES: ""

Expand Down Expand Up @@ -313,11 +313,10 @@ jobs:
build-javascript:
name: Build and test JavaScript wrapper
needs: [build-release]

strategy:
matrix:
architecture:
[linux-aarch64, linux-x86_64, darwin-universal]
architecture: [linux-aarch64, linux-x86_64, darwin-universal]
include:
- os: ubuntu-latest
architecture: linux-aarch64
Expand All @@ -327,7 +326,7 @@ jobs:
architecture: darwin-universal

runs-on: ${{ matrix.os }}

defaults:
run:
working-directory: wrappers/javascript
Expand Down Expand Up @@ -434,7 +433,6 @@ jobs:
needs: [checks]

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

runs-on: ubuntu-latest
Expand Down Expand Up @@ -466,7 +464,8 @@ jobs:

- name: Build
run: |
cargo install --bins --git https://github.com/rust-embedded/cross --locked --tag v${{ env.CROSS_VERSION }} cross
# Using a fixed pre-release tag with a fix for NDK 25 support
cargo install --git https://github.com/cross-rs/cross.git --rev 085092c cross
# Required for compatibility with manylinux2014:
# https://github.com/briansmith/ring/issues/1728
if [ "${{ matrix.target }}" = "aarch64-linux-android" ]; then
Expand Down
Loading

0 comments on commit ec57eb2

Please sign in to comment.