Skip to content

CI fixes#25

Merged
rib merged 1 commit intomainfrom
rib/ci-fixes
Apr 2, 2026
Merged

CI fixes#25
rib merged 1 commit intomainfrom
rib/ci-fixes

Conversation

@rib
Copy link
Copy Markdown
Member

@rib rib commented Apr 2, 2026

No description provided.

Comment on lines +40 to +44
distribution: 'temurin'
java-version: '17'
distribution: "temurin"
java-version: "17"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yaml doesn't need any quoting right, drop entirely?

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.

this is just how vscode wants to format it by default, so it just makes my life easier when I edit the later and vscode automatically makes the same change - without me needing to special-case disabling save on format here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

(well I suppose vscode won't add the quotes back if they are removed entirely, so that'd be fine 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.

But it also didn't add any quotations on any other string, like job names etc?

EDIT after concurrent post: yeah, the suggestion is to drop the quotes entirely.

Comment on lines 3 to 7
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::{
Copy link
Copy Markdown
Member

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

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

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

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.

Comment on lines -18 to +21
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/,
]
Copy link
Copy Markdown
Member

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

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

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)

@rib
Copy link
Copy Markdown
Member Author

rib commented Apr 2, 2026

I wonder if CI should really be building for all of these architectures considering how slow it makes it

@rib rib merged commit 5c9ea1b into main Apr 2, 2026
9 checks passed
@MarijnS95 MarijnS95 deleted the rib/ci-fixes branch April 2, 2026 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants