From 69aceef8f6ff5690e0e92bc8aac7dfded02363bf Mon Sep 17 00:00:00 2001
From: reivilibre <oliverw@element.io>
Date: Wed, 5 Mar 2025 14:20:17 +0000
Subject: [PATCH] Actually fix CI build wheels. (#18213)

Follows: #18212

---------

Signed-off-by: Olivier 'reivilibre <oliverw@matrix.org>
---
 .ci/before_build_wheel.sh               |  7 +++----
 .github/workflows/release-artifacts.yml |  2 +-
 Cargo.lock                              | 20 ++++++++++----------
 changelog.d/18213.misc                  |  1 +
 rust/Cargo.toml                         |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 changelog.d/18213.misc

diff --git a/.ci/before_build_wheel.sh b/.ci/before_build_wheel.sh
index 4356dbc7e7..56108dcd60 100644
--- a/.ci/before_build_wheel.sh
+++ b/.ci/before_build_wheel.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
-set -eu
+set -xeu
 
 # On 32-bit Linux platforms, we need libatomic1 to use rustup
-if command -v apt-get &> /dev/null; then
-    apt-get update
-    apt-get install libatomic1
+if command -v yum &> /dev/null; then
+   yum install -y libatomic
 fi
 
 # Install a Rust toolchain
diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
index 10583bc060..3311f09b2d 100644
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -139,7 +139,7 @@ jobs:
           python-version: "3.x"
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.19.1
+        run: python -m pip install cibuildwheel==2.23.0
 
       - name: Set up QEMU to emulate aarch64
         if: matrix.arch == 'aarch64'
diff --git a/Cargo.lock b/Cargo.lock
index b9aa1c8a6b..b8247e1315 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -277,9 +277,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
+checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -296,9 +296,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
+checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -306,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
+checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7"
+checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -339,9 +339,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4"
+checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
 dependencies = [
  "heck",
  "proc-macro2",
diff --git a/changelog.d/18213.misc b/changelog.d/18213.misc
new file mode 100644
index 0000000000..0e8516a323
--- /dev/null
+++ b/changelog.d/18213.misc
@@ -0,0 +1 @@
+Fix wheel building configuration in CI by installing libatomic1.
\ No newline at end of file
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index a8a24ee1c7..651b268f86 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -30,7 +30,7 @@ http = "1.1.0"
 lazy_static = "1.4.0"
 log = "0.4.17"
 mime = "0.3.17"
-pyo3 = { version = "0.23.2", features = [
+pyo3 = { version = "0.23.5", features = [
     "macros",
     "anyhow",
     "abi3",