Skip to content

Commit

Permalink
fix linux images (#1626)
Browse files Browse the repository at this point in the history
- fix centos
- bump kernel
- fix ci
  • Loading branch information
Emilgardis authored Feb 12, 2025
2 parents 107433f + db365f2 commit 44fe9be
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/actions/cargo-install-upload-artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/cargo-publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions docker/Dockerfile.aarch64-unknown-linux-gnu.centos
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions docker/Dockerfile.native.centos
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/linux-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 44fe9be

Please sign in to comment.