Merge remote-tracking branch 'dsr/anoncreds-w3c-format-changes' into …

…anoncreds-w3c-encoding Signed-off-by: artem.ivanov <[email protected]> # Conflicts: # src/data_types/w3c/proof.rs # src/services/w3c/credential_conversion.rs # src/services/w3c/issuer.rs # src/services/w3c/prover.rs # src/services/w3c/verifier.rs
hyperledger · Jan 11, 2024 · 7cae4c9 · 7cae4c9
2 parents 1e0f32b + 4ae0d15
commit 7cae4c9
Show file tree

Hide file tree

Showing 12 changed files with 1,416 additions and 206 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 name: "Anoncreds"
 
 env:
-  RUST_VERSION: "1.65.0"
+  RUST_VERSION: "stable 6 months ago"
   CROSS_VERSION: "0.2.4"
 
 on:
@@ -143,7 +143,7 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
         run: |
           if [ -n "${{ matrix.use_cross }}" ]; then
-            cargo install --locked  --git https://github.com/cross-rs/cross --tag v${{ env.CROSS_VERSION }} cross
+            cargo install --locked --git https://github.com/cross-rs/cross --tag v${{ env.CROSS_VERSION }} cross
             cross build --release --package anoncreds --target ${{matrix.target}} --features vendored
           else
             cargo build --release --package anoncreds --target ${{matrix.target}} --features vendored
@@ -253,7 +253,6 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-
   build-py:
     name: Build Python
     needs: [build-release]
@@ -342,6 +341,9 @@ jobs:
             i686-linux-android,
             x86_64-linux-android,
           ]
+    # NB: RUST_VERSION must be <1.68 here to support NDK 17
+    env:
+      RUST_VERSION: "1.67"
 
     steps:
       - name: Checkout
@@ -359,6 +361,7 @@ jobs:
       - name: Build
         run: |
           cargo install --locked --git https://github.com/cross-rs/cross --tag v${{ env.CROSS_VERSION }} cross
+          cp Cargo.lock.android Cargo.lock
           cross build --release --target ${{ matrix.target }} --features=vendored
 
       - name: Upload artifacts
@@ -418,7 +421,7 @@ jobs:
           targets: ${{matrix.architecture}}
 
       - name: Build
-        run: cargo  build --release --target ${{matrix.architecture}} --features=vendored
+        run: cargo build --release --target ${{matrix.architecture}} --features=vendored
 
       - name: Save artifacts
         uses: actions/upload-artifact@v3