Skip to content

Conversation

@MarijnS95
Copy link
Member

Moves the NDK r23 -lgcc workaround to ndk_build::cargo::cargo_ndk(), so that cargo apk -- blanket invocations receive it too. This should solve winit CI failures again now that GitHub Actions Virtual Enviroments are finishing up the migration to NDK r23.

@MarijnS95 MarijnS95 requested a review from msiglreith June 11, 2022 08:13
@MarijnS95 MarijnS95 force-pushed the release-cargo-apk-0.9.2 branch 2 times, most recently from 4178f66 to a8078cd Compare June 13, 2022 09:01
Moves the NDK r23 `-lgcc` workaround to `ndk_build::cargo::cargo_ndk()`,
so that `cargo apk --` blanket invocations receive it too.  This should
solve `winit` CI failures again now that GitHub Actions Virtual
Enviroments are finishing up the migration to NDK r23.
@MarijnS95 MarijnS95 force-pushed the release-cargo-apk-0.9.2 branch from a8078cd to 5451ed2 Compare June 13, 2022 09:03
@MarijnS95 MarijnS95 requested a review from dvc94ch June 13, 2022 09:08
@MarijnS95
Copy link
Member Author

@msiglreith Shall we get this out of the door now to get rid of red CI in winit? I don't have anything queued up for these crates, all my changes are targeted towards ndk and friends.

Comment on lines +14 to +22
anyhow = "1.0.57"
cargo-subcommand = "0.7"
dunce = "1"
env_logger = "0.9"
log = "0.4"
ndk-build = { path = "../ndk-build", version = "0.6.0" }
serde = "1"
thiserror = "1.0.31"
toml = "0.5"
Copy link
Member Author

Choose a reason for hiding this comment

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

This passes -Zminimal-versions, I didn't bother to find the minimal working ones for anyhow/thiserror though.

@MarijnS95 MarijnS95 merged commit 60e34d1 into master Jun 13, 2022
@MarijnS95 MarijnS95 deleted the release-cargo-apk-0.9.2 branch June 13, 2022 12:45
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.

3 participants