From ba856e127a6af7cbf5a6292eafc413c9cdc096ec Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Thu, 26 Mar 2026 05:26:54 +0100 Subject: [PATCH] Fix CI (#4546) * Fix cargo-deny erroring on new jni-sys version * Fix unicode-segmentation bumping MSRV * Fix cargo-deny finding new script in android-activity --- .github/workflows/ci.yml | 2 +- deny.toml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b7eeac85..3e0d06714 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -136,7 +136,7 @@ jobs: - name: Generate lockfile # Also updates the crates.io index - run: cargo generate-lockfile && cargo update -p smol_str --precise 0.3.2 + run: cargo generate-lockfile && cargo update -p smol_str --precise 0.3.2 && cargo update -p unicode-segmentation --precise 1.12.0 - name: Install GCC Multilib if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686') diff --git a/deny.toml b/deny.toml index 87fb19610..90367660a 100644 --- a/deny.toml +++ b/deny.toml @@ -43,6 +43,9 @@ skip = [ { crate = "bitflags@1", reason = "the ecosystem is in the process of migrating" }, { crate = "rustix@0.38", reason = "the ecosystem is in the process of migrating" }, { crate = "linux-raw-sys@0.4", reason = "the ecosystem is in the process of migrating" }, + { crate = "jni-sys@0.3", reason = "uses the semver trick to depend on v0.4, but `ndk` hasn't been updated to v0.4 yet" }, + { crate = "thiserror@1.0", reason = "dep of `ndk` crate, yet to be updated" }, + { crate = "thiserror-impl@1.0", reason = "dep of `thiserror`" }, ] wildcards = "allow" # at least until https://github.com/EmbarkStudios/cargo-deny/issues/241 is fixed @@ -51,9 +54,7 @@ include-archives = true interpreted = "deny" [[bans.build.bypass]] -allow = [ - { path = "generate-bindings.sh", checksum = "268ec23248218d779e33853cdc60e2985e70214ff004716cd734270de1f6b561" }, -] +allow-globs = ["android-games-sdk/import-games-sdk.sh"] crate = "android-activity" [[bans.build.bypass]]