Skip to content

CI fixes #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rib merged 1 commit into from
Apr 2, 2026
Merged

CI fixes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ jobs:
fail-fast: false
matrix:
rust_version: [stable]
cargo_ndk_args: [-t arm64-v8a -t armeabi-v7a -t x86_64 -t x86 -o app/src/main/jniLibs/]
cargo_ndk_args:
[
-t arm64-v8a -t armeabi-v7a -t x86_64 -t x86 -o app/src/main/jniLibs/,
]
Comment on lines -18 to +21
Copy link
Copy Markdown
Member

@MarijnS95 MarijnS95 Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't notice the first time - can we just make this a multiline Yaml array if it formats it across multiple lines anyway?

Copy link
Copy Markdown
Member Author

@rib rib Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it does look ugly like this yeah

lets just land this though when if it passes CI, we can tidy this up some time and avoid another restart of the build

if this CI build fails then yeah can split it up

Copy link
Copy Markdown
Member Author

@rib rib Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(there's probably lots that could be improved about the ci.yaml workflow, and atm the aim was just intended to be a quick fix to get a greenlight and that just happend to pull in some automatic formatting changes when I added the -P 26 argument for the agdk-cpal build)

steps:
- uses: actions/checkout@v3

Expand All @@ -37,8 +40,8 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
distribution: temurin
java-version: 17

- name: Setup Android SDK
uses: android-actions/setup-android@v2
Expand Down Expand Up @@ -93,7 +96,7 @@ jobs:
- name: Build agdk-cpal
working-directory: agdk-cpal
run: >
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} -P 26 build &&
./gradlew build &&
find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;

Expand Down Expand Up @@ -147,7 +150,6 @@ jobs:
# ./gradlew build &&
# find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;


format:
runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 1 addition & 2 deletions na-mainloop/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
use std::sync::OnceLock;

use android_activity::{
AndroidApp, InputStatus, MainEvent, OnCreateState, PollEvent,
input::{InputEvent, KeyAction, KeyEvent, KeyMapChar, MotionAction},
ndk, ndk_sys,
ndk, ndk_sys, AndroidApp, InputStatus, MainEvent, OnCreateState, PollEvent,
};
use jni::{
Comment on lines 3 to 7
Copy link
Copy Markdown
Member

@MarijnS95 MarijnS95 Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might conflict with #24 where I ran cargo fmt -- --config imports_granularity=crate --config group_imports=StdExternalCrate.

Copy link
Copy Markdown
Member Author

@rib rib Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it it came up with the same result then hopefully it's fine?

Copy link
Copy Markdown
Member Author

@rib rib Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but yeah the purpose of my opening this pr was to help you get a green light with your other prs, so fine with dropping this too

Copy link
Copy Markdown
Member

@MarijnS95 MarijnS95 Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably fine, let's see.

objects::{JObject, JString},
Expand Down
Loading