Skip to content

Commit

Permalink
Fix android CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Hjort committed Jan 16, 2024
1 parent 31c2c29 commit 4784c06
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,7 @@ jobs:
toolchain: 1.69
- name: Create native dependencies
run: make add-android-targets && make android
- name: Initialize root project
run: mvn install -N
- name: Build android sdk
run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots install
run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots -X install
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ jobs:
- name: Make android native dependencies
run: make add-android-targets && make android
# Builds and tests the sdk
- name: Initialize root project
run: mvn install -N
- name: Build and test android sdk
run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots install
- name: Upload aar
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ git clone https://github.com/Concordium/concordium-java-sdk.git --recurse-submod
2. Set the ANDROID_HOME environment variable to the path to your Android SDK installation.
3. Run `make add-android-targets` from the root of this repository.
4. Run `make android` from the root of this repository.
4. Run `mvn install -N` from the root of the repository.
5. Run `mvn install` from the root of the [concordium-android-sdk](./concordium-android-sdk) folder.

`make add-android-targets` adds the rust targets that the native libraries will be built for.
Expand Down
2 changes: 1 addition & 1 deletion concordium-android-sdk/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
android:versionCode="1"
android:versionName="1.0"
>
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="27" />
<uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27" />
</manifest>

0 comments on commit 4784c06

Please sign in to comment.