Skip to content

Commit

Permalink
CI Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Hjort committed Jan 3, 2024
1 parent 24c7027 commit 83c3ac7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -79,13 +79,15 @@ jobs:
key: ${{ runner.os }}-${{ env.dummy }}-rust-java-deps-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock', '**/pom.xml') }}
restore-keys: |
${{ runner.os }}-${{ env.dummy }}-rust-java-deps
- name: Initialize Parent Pom
run: mvn install -N
- name: Build and test sdk
run: cd concordium-sdk && mvn --batch-mode --update-snapshots install
- name: Build and test examples
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
Expand All @@ -101,7 +103,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
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions concordium-android-sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@
<manifest>
<debuggable>true</debuggable>
</manifest>
<sdk>
<platform>27</platform>
</sdk>
<nativeLibrariesDirectory>${project.basedir}/native</nativeLibrariesDirectory>
</configuration>
<dependencies>
Expand Down
1 change: 0 additions & 1 deletion concordium-sdk-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<modules>
<module>concordium-sdk</module>
<module>concordium-android-sdk</module>
<module>concordium-sdk-examples</module>
</modules>
</project>

0 comments on commit 83c3ac7

Please sign in to comment.