Skip to content

Commit

Permalink
Merge branch 'main' into chore/update-js-version-022
Browse files Browse the repository at this point in the history
  • Loading branch information
swcurran authored May 24, 2024
2 parents 3c3606b + e2b6f97 commit 60854f9
Show file tree
Hide file tree
Showing 36 changed files with 2,012 additions and 491 deletions.
45 changes: 41 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,47 @@ updates:
# Maintain dependencies for GitHub Actions
# - Check for updates once a week
# - Group all updates into a single PR
- package-ecosystem: github-actions
directory: /
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly
interval: "weekly"
groups:
all-actions:
patterns: [ "*" ]
patterns: [ "*" ]

# Maintain dependencies for TypeScript and JavaScript
- package-ecosystem: "npm"
directory: "/wrappers/javascript"
schedule:
interval: "weekly"
day: "monday"
time: "04:00"
timezone: "Canada/Pacific"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-patch"]

# Maintain dependencies for Cargo Packages
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "04:00"
timezone: "Canada/Pacific"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]

# Maintain dependencies for Cargo Packages
- package-ecosystem: "cargo"
directory: "./askar-crypto/fuzz"
schedule:
interval: "weekly"
day: "monday"
time: "04:00"
timezone: "Canada/Pacific"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]

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 60854f9

Please sign in to comment.