From dd321aa1d903cb67c4a72cbbd92bc906a1ca0354 Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Fri, 10 Jan 2025 21:12:23 +0800 Subject: [PATCH 1/2] fix(deps): update rust crate moka to v0.12.10 --- Cargo.lock | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00b696960755..f4638d125b5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2076,16 +2076,16 @@ dependencies = [ [[package]] name = "moka" -version = "0.12.9" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23db87a7f248211f6a7c8644a1b750541f8a4c68ae7de0f908860e44c0c201f6" +checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" dependencies = [ "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", "loom", "parking_lot 0.12.3", - "quanta", + "portable-atomic", "rustc_version", "smallvec", "tagptr", @@ -2488,6 +2488,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" + [[package]] name = "powerfmt" version = "0.2.0" @@ -2549,21 +2555,6 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" -[[package]] -name = "quanta" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -2668,15 +2659,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "raw-cpuid" -version = "11.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" -dependencies = [ - "bitflags 2.6.0", -] - [[package]] name = "redox_syscall" version = "0.2.16" From c6a4d550047240095e6cab77c6a5b6d05c702307 Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Fri, 10 Jan 2025 21:17:00 +0800 Subject: [PATCH 2/2] Revert "fix: mips-* disabled, moka uses atomic64 by default" This reverts commit 95971a9b392252b8f0e839762de09863bc99e050. --- .github/workflows/build-release.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index dcb527d765f9..34763f451cbe 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -46,16 +46,13 @@ jobs: toolchain: stable - target: aarch64-unknown-linux-musl toolchain: stable - # FIXME: moka uses atomic64 by default - # - target: mips-unknown-linux-gnu - # toolchain: nightly + - target: mips-unknown-linux-gnu + toolchain: nightly # cross mips-*-musl images are disabled # - target: mips-unknown-linux-musl # toolchain: nightly - # FIXME: moka uses atomic64 by default - # - target: mipsel-unknown-linux-gnu - # toolchain: nightly - # cross mips-*-musl images are disabled + - target: mipsel-unknown-linux-gnu + toolchain: nightly # - target: mipsel-unknown-linux-musl # toolchain: nightly # FIXME: ring doesn't support mips64 CPU @@ -63,8 +60,8 @@ jobs: # toolchain: nightly # - target: mips64-unknown-linux-muslabi64 # toolchain: nightly - # - target: mips64el-unknown-linux-gnuabi64 - # toolchain: nightly + - target: mips64el-unknown-linux-gnuabi64 + toolchain: nightly # FIXME: Link Error. # = note: mips64el-linux-muslsf-gcc: error: crt1.o: No such file or directory # mips64el-linux-muslsf-gcc: error: crti.o: No such file or directory