CI Fixes

Concordium · Jan 3, 2024 · 6c4cd93 · 6c4cd93
1 parent 24c7027
commit 6c4cd93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -65,7 +65,7 @@ jobs:
     - name: Setup Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.62
+        toolchain: 1.69
     - name: Create native dependencies
       run: make
     - name: Cache cargo dependencies and targets
@@ -85,7 +85,7 @@ jobs:
       run: cd concordium-sdk-examples && mvn --batch-mode --update-snapshots install
   build-android:
     # Use fixed OS version because we install packages on the system.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ !github.event.pull_request.draft }}
     steps:
     - name: Checkout
@@ -101,7 +101,7 @@ jobs:
     - name: Setup Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.62
+        toolchain: 1.69
     - name: Create native dependencies
       run: make add-android-targets && make android
     - name: Build android sdk

diff --git a/Makefile b/Makefile
@@ -35,6 +35,7 @@ define android-command
 endef
 
 add-android-targets:
+	cargo install --version 3.4.0 cargo-ndk --locked
 	rustup target add aarch64-linux-android
 	rustup target add armv7-linux-androideabi
 	rustup target add i686-linux-android

diff --git a/concordium-sdk-examples/pom.xml b/concordium-sdk-examples/pom.xml
@@ -12,7 +12,6 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <lombok.version>1.18.24</lombok.version>
-
     </properties>
 
     <dependencies>