Update Github Actions

Luthaf · Mar 28, 2023 · eee1ad3 · eee1ad3
1 parent cb9430b
commit eee1ad3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,16 +13,16 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-22.04
             rust-version: stable
             rust-target: x86_64-unknown-linux-gnu
             build-type: debug
-          - os: ubuntu-18.04
+          - os: ubuntu-22.04
             rust-version: stable
             rust-target: x86_64-unknown-linux-gnu
             build-type: release
-          - os: ubuntu-18.04
-            rust-version: 1.53
+          - os: ubuntu-22.04
+            rust-version: 1.61
             rust-target: x86_64-unknown-linux-gnu
             build-type: debug
     steps:

diff --git a/python/build-wheels/Dockerfile b/python/build-wheels/Dockerfile
@@ -1,5 +1,13 @@
 FROM quay.io/pypa/manylinux2010_x86_64
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
+# We need a more recent audiwheel
+RUN /opt/_internal/pipx/venvs/auditwheel/bin/python -m pip install --upgrade auditwheel
+
+# Manually download rustup-init version 1.25.1, since 1.25.2 requires a more
+# modern glibc. We can remove this if https://github.com/rust-lang/rustup/issues/3203
+# is solved by making rustup-init.sh able to detect the glibc version.
+RUN curl -O https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init && \
+    chmod +x ./rustup-init && \
+    ./rustup-init -y --profile minimal --default-toolchain 1.63
 
 ENV PATH="/root/.cargo/bin:${PATH}"