From 5d039255c5af9b63bf0d44c866b1152ac7cb7728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Wed, 12 Feb 2025 09:59:49 +0100 Subject: [PATCH 1/5] fix centos --- docker/Dockerfile.native.centos | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/Dockerfile.native.centos b/docker/Dockerfile.native.centos index ff80e9215..1ad529798 100644 --- a/docker/Dockerfile.native.centos +++ b/docker/Dockerfile.native.centos @@ -11,6 +11,13 @@ RUN /native-linux-image.sh FROM centos:7 +# From https://github.com/rust-lang/rust/blob/672e3aaf28ab1e5cbe80b3ff012cd3a8e4ef98af/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile#L9-L12 +# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault. +RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \ + -e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!' +RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf + + COPY common.sh lib.sh / RUN /common.sh From 6601fbe26b785ceb9e2cd378d3e983c6e20578c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Wed, 12 Feb 2025 10:13:19 +0100 Subject: [PATCH 2/5] bump kernel --- docker/linux-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux-image.sh b/docker/linux-image.sh index 745ac2fa9..d7bd3d0f6 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -57,7 +57,7 @@ max_kernel_version() { main() { # arch in the rust target local arch="${1}" \ - kversion=5.10.0-26 + kversion=5.10.0-33 local debsource="deb http://http.debian.net/debian/ bullseye main" debsource="${debsource}\ndeb http://security.debian.org/ bullseye-security main" From 7b084dc51760e375acbfc537ab65054e7d4cacb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Wed, 12 Feb 2025 10:23:23 +0100 Subject: [PATCH 3/5] update download/upload artifact --- .github/actions/cargo-publish/action.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/cargo-publish/action.yml b/.github/actions/cargo-publish/action.yml index c32cb78c6..25b769fa7 100644 --- a/.github/actions/cargo-publish/action.yml +++ b/.github/actions/cargo-publish/action.yml @@ -21,7 +21,7 @@ runs: - name: Download artifacts id: download-artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: ${{ runner.temp }}/artifacts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f754a676b..7d3f498f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -423,7 +423,7 @@ jobs: with: ref: ${{ inputs.checkout-ref }} - uses: ./.github/actions/setup-rust - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: path: ${{ runner.temp }}/artifacts - name: Grab PR number From 10094117c40c4897993ac87842384ee4fd538f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Wed, 12 Feb 2025 10:33:10 +0100 Subject: [PATCH 4/5] fix aarch64 centos7 --- docker/Dockerfile.aarch64-unknown-linux-gnu.centos | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu.centos b/docker/Dockerfile.aarch64-unknown-linux-gnu.centos index 5b1c4e2f3..73b92c611 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu.centos +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu.centos @@ -6,6 +6,12 @@ RUN /linux-image.sh aarch64 FROM centos:7 +# From https://github.com/rust-lang/rust/blob/672e3aaf28ab1e5cbe80b3ff012cd3a8e4ef98af/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile#L9-L12 +# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault. +RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \ + -e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!' +RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf + COPY common.sh lib.sh / RUN /common.sh From db365f2c1a3374ff7d182ae2cf2e73eb7ca235e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Wed, 12 Feb 2025 10:52:04 +0100 Subject: [PATCH 5/5] oops --- .github/actions/cargo-install-upload-artifacts/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/cargo-install-upload-artifacts/action.yml b/.github/actions/cargo-install-upload-artifacts/action.yml index bcf81ea36..c251921f5 100644 --- a/.github/actions/cargo-install-upload-artifacts/action.yml +++ b/.github/actions/cargo-install-upload-artifacts/action.yml @@ -77,7 +77,7 @@ runs: - name: Upload artifacts if: ${{ steps.archive.outputs.path }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.archive.outputs.name }} path: ${{ steps.archive.outputs.path }}