Skip to content

Commit 44fe9be

Browse files
authored
fix linux images (#1626)
- fix centos - bump kernel - fix ci
2 parents 107433f + db365f2 commit 44fe9be

File tree

6 files changed

+17
-4
lines changed

6 files changed

+17
-4
lines changed

.github/actions/cargo-install-upload-artifacts/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ runs:
7777

7878
- name: Upload artifacts
7979
if: ${{ steps.archive.outputs.path }}
80-
uses: actions/upload-artifact@v3
80+
uses: actions/upload-artifact@v4
8181
with:
8282
name: ${{ steps.archive.outputs.name }}
8383
path: ${{ steps.archive.outputs.path }}

.github/actions/cargo-publish/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121

2222
- name: Download artifacts
2323
id: download-artifacts
24-
uses: actions/download-artifact@v3
24+
uses: actions/download-artifact@v4
2525
with:
2626
path:
2727
${{ runner.temp }}/artifacts

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ jobs:
423423
with:
424424
ref: ${{ inputs.checkout-ref }}
425425
- uses: ./.github/actions/setup-rust
426-
- uses: actions/download-artifact@v3
426+
- uses: actions/download-artifact@v4
427427
with:
428428
path: ${{ runner.temp }}/artifacts
429429
- name: Grab PR number

docker/Dockerfile.aarch64-unknown-linux-gnu.centos

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ RUN /linux-image.sh aarch64
66

77
FROM centos:7
88

9+
# From https://github.com/rust-lang/rust/blob/672e3aaf28ab1e5cbe80b3ff012cd3a8e4ef98af/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile#L9-L12
10+
# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault.
11+
RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \
12+
-e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!'
13+
RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
14+
915
COPY common.sh lib.sh /
1016
RUN /common.sh
1117

docker/Dockerfile.native.centos

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ RUN /native-linux-image.sh
1111

1212
FROM centos:7
1313

14+
# From https://github.com/rust-lang/rust/blob/672e3aaf28ab1e5cbe80b3ff012cd3a8e4ef98af/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile#L9-L12
15+
# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault.
16+
RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \
17+
-e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!'
18+
RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
19+
20+
1421
COPY common.sh lib.sh /
1522
RUN /common.sh
1623

docker/linux-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ max_kernel_version() {
5757
main() {
5858
# arch in the rust target
5959
local arch="${1}" \
60-
kversion=5.10.0-26
60+
kversion=5.10.0-33
6161

6262
local debsource="deb http://http.debian.net/debian/ bullseye main"
6363
debsource="${debsource}\ndeb http://security.debian.org/ bullseye-security main"

0 commit comments

Comments
 (0)