Use xbuild instead of cargo apk in the CI #3086

notgull · 2023-09-04T20:36:55Z

In addition to cargo apk being deprecated, xbuild also has support for ios.

Tested on all platforms changed
Added an entry to CHANGELOG.md if knowledge of this change could be valuable to users
Updated documentation to reflect any user-facing changes, including notes of platform-specific behavior
Created or updated an example program if it would help users understand this functionality
Updated feature matrix, if new features were added or implemented

madsmtm

Huh, I didn't know it was deprecated. Do you have a reference on why?

xbuild-target/README.md

notgull · 2023-09-04T20:46:30Z

Huh, I didn't know it was deprecated. Do you have a reference on why?

Yes, cargo apk is deprecated, see rust-mobile/cargo-apk#31 (comment)

notgull · 2023-09-05T01:37:16Z

CI is taking a while to be queued. What's that about?

madsmtm · 2023-09-05T04:03:19Z

See https://github.com/rust-windowing/winit/actions/runs/6077445578

notgull · 2023-09-10T21:19:32Z

The CI error is #3093

kchibisov · 2023-09-16T10:49:08Z

r @rib @MarijnS95

notgull · 2023-10-08T04:02:39Z

@MarijnS95 Any chance you can review this in the near future?

xbuild-target/Cargo.toml

xbuild-target/README.md

MarijnS95 · 2023-10-08T13:43:18Z

xbuild-target/src/main.rs

+fn main() {
+    winit::event_loop::EventLoop::new()
+        .unwrap()
+        .run(|_, _| todo!())


A real implementation is probably provided by the example that was being compiled before? I'd rather test that, including the part that forwards android_activity::AndroidApp into winit.

I added an actual Android winit app, but it looks like there is a linker error that doesn't occur on my machine.

.github/workflows/ci.yml

xbuild-target/README.md

MarijnS95 · 2023-10-08T13:47:47Z

@notgull sure, done. I've been out of the country for quite some time, only got to you r? now.

notgull · 2023-10-08T16:50:09Z

I'm not getting the linker error on my machine

kchibisov · 2023-10-15T04:04:08Z

.github/workflows/ci.yml

+    - name: Build and package crate for Android
+      if: contains(matrix.platform.target, 'android')
+      # TODO: Figure out why this build fails on Github Actions
+      run: x build -p ios-xbuild-target --platform android --arch arm64


How does it work? Does it simply abort now or it builds, but not with android target?

android-xbuild-target/Cargo.toml

kchibisov · 2023-10-15T04:24:07Z

android-xbuild-target/README.md

+# android-xbuild-target
+
+This is a crate that can be built via `x build` in order to simplify CI testing.


Maybe we should create a common xbuild dir and put these 2 crates there with common docs.

android-xbuild-target/Cargo.toml

In addition to cargo apk being deprecated, xbuild also has support for ios. Signed-off-by: John Nunley <[email protected]>

Signed-off-by: John Nunley <[email protected]>

MarijnS95 · 2023-10-15T18:19:37Z

xbuild/ios-target/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "ios-xbuild-target"


Nit: given the directory structure I'd name these xbuild-ios-target. After all, xbuild is targeting an architecture, the architecture isn't targeting xbuild.

MarijnS95

LGTM, just unfortunate that we cannot have xbuild target examples yet :/

notgull · 2024-02-01T03:22:10Z

Closing for now as this is blocked on rust-mobile/xbuild#158

madsmtm reviewed Sep 4, 2023

View reviewed changes

xbuild-target/README.md Outdated Show resolved Hide resolved

daxpedda added DS - android DS - ios labels Sep 7, 2023

notgull force-pushed the notgull/ia-xbuild branch from cbb4982 to 98b7e09 Compare September 10, 2023 20:56

notgull requested review from madsmtm and msiglreith September 10, 2023 21:19

notgull mentioned this pull request Sep 15, 2023

Install cargo-apk with the stable toolchain #3098

Merged

notgull force-pushed the notgull/ia-xbuild branch from 5c4873c to 482bd12 Compare September 30, 2023 21:51

MarijnS95 reviewed Oct 8, 2023

View reviewed changes

notgull force-pushed the notgull/ia-xbuild branch from dd4c73b to fe95cce Compare October 14, 2023 02:45

notgull requested a review from MarijnS95 October 14, 2023 03:03

notgull force-pushed the notgull/ia-xbuild branch from fe95cce to 8a212a1 Compare October 14, 2023 22:43

kchibisov requested changes Oct 15, 2023

View reviewed changes

notgull added 9 commits October 14, 2023 21:37

Use xbuild instead of cargo apk in the CI

f9a975e

In addition to cargo apk being deprecated, xbuild also has support for ios. Signed-off-by: John Nunley <[email protected]>

Fix malformed install-action call

e30f112

Signed-off-by: John Nunley <[email protected]>

Typo!

5cfdb3f

Signed-off-by: John Nunley <[email protected]>

Empty commit to re-run CI

fe893e6

Signed-off-by: John Nunley <[email protected]>

Once more unto the breach!

8671481

Signed-off-by: John Nunley <[email protected]>

Fix compile error in xbuild-target

0c4e725

Signed-off-by: John Nunley <[email protected]>

Don't use CMD subselection on Android

af32c5c

Signed-off-by: John Nunley <[email protected]>

Disable test builds on Android

023ab59

Signed-off-by: John Nunley <[email protected]>

Hacky way to exclude 1.65.0 on Android

999a1f8

Signed-off-by: John Nunley <[email protected]>

notgull added 4 commits October 14, 2023 21:37

Review comments

49a3158

Signed-off-by: John Nunley <[email protected]>

fmt

73348f4

Signed-off-by: John Nunley <[email protected]>

Eyepatch for the android linker error

9382b72

Signed-off-by: John Nunley <[email protected]>

Review comments

d365744

Signed-off-by: John Nunley <[email protected]>

notgull force-pushed the notgull/ia-xbuild branch from 8a212a1 to d365744 Compare October 15, 2023 04:37

MarijnS95 reviewed Oct 15, 2023

View reviewed changes

MarijnS95 approved these changes Oct 15, 2023

View reviewed changes

notgull mentioned this pull request Dec 24, 2023

Docker image rust-mobile/xbuild#158

Open

notgull closed this Feb 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use xbuild instead of cargo apk in the CI #3086

Use xbuild instead of cargo apk in the CI #3086

notgull commented Sep 4, 2023

madsmtm left a comment

notgull commented Sep 4, 2023

notgull commented Sep 5, 2023

madsmtm commented Sep 5, 2023

notgull commented Sep 10, 2023 •

edited

Loading

kchibisov commented Sep 16, 2023

notgull commented Oct 8, 2023

MarijnS95 Oct 8, 2023

notgull Oct 8, 2023

MarijnS95 commented Oct 8, 2023

notgull commented Oct 8, 2023

kchibisov Oct 15, 2023

kchibisov Oct 15, 2023

MarijnS95 Oct 15, 2023

MarijnS95 left a comment

notgull commented Feb 1, 2024

		# android-xbuild-target

		This is a crate that can be built via `x build` in order to simplify CI testing.

Use xbuild instead of cargo apk in the CI #3086

Use xbuild instead of cargo apk in the CI #3086

Conversation

notgull commented Sep 4, 2023

madsmtm left a comment

Choose a reason for hiding this comment

notgull commented Sep 4, 2023

notgull commented Sep 5, 2023

madsmtm commented Sep 5, 2023

notgull commented Sep 10, 2023 • edited Loading

kchibisov commented Sep 16, 2023

notgull commented Oct 8, 2023

MarijnS95 Oct 8, 2023

Choose a reason for hiding this comment

notgull Oct 8, 2023

Choose a reason for hiding this comment

MarijnS95 commented Oct 8, 2023

notgull commented Oct 8, 2023

kchibisov Oct 15, 2023

Choose a reason for hiding this comment

kchibisov Oct 15, 2023

Choose a reason for hiding this comment

MarijnS95 Oct 15, 2023

Choose a reason for hiding this comment

MarijnS95 left a comment

Choose a reason for hiding this comment

notgull commented Feb 1, 2024

notgull commented Sep 10, 2023 •

edited

Loading