From 2502ab98fe0b653f8cde08d231e121649c8365ea Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Mon, 1 Jul 2024 14:21:43 +0800 Subject: [PATCH] Update CI for LLVM 17 In addition we no longer run tests against Arch Linux, as Arch not shipping the right LLVM versions reliably makes this too annoying. --- .github/workflows/linux.yml | 1 - ci/docker/arch/Dockerfile | 17 ----------------- ci/docker/debian/Dockerfile | 4 ++-- ci/docker/fedora/Dockerfile | 4 ++-- ci/docker/ubuntu/Dockerfile | 4 ++-- ci/mac.sh | 2 +- 6 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 ci/docker/arch/Dockerfile diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 89485331d..3498bf387 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,7 +9,6 @@ jobs: fail-fast: false matrix: image: - - arch - debian - fedora - ubuntu diff --git a/ci/docker/arch/Dockerfile b/ci/docker/arch/Dockerfile deleted file mode 100644 index 352275302..000000000 --- a/ci/docker/arch/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM archlinux:latest - -ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL sparse -ENV LLVM_VERSION 16 -ENV RUST_VERSION 1.70 - -ENV PATH /opt/cargo/bin:$PATH -ENV CARGO_HOME /opt/cargo -ENV RUSTUP_HOME /opt/rustup - -RUN pacman-key --init && \ - pacman-key --populate && \ - pacman -Sy --noconfirm archlinux-keyring && \ - pacman -Syu --noconfirm rustup tar git base-devel curl llvm$LLVM_VERSION - -RUN rustup toolchain install --profile minimal $RUST_VERSION && \ - rustup default $RUST_VERSION diff --git a/ci/docker/debian/Dockerfile b/ci/docker/debian/Dockerfile index c6fcbadcd..0f0723fa6 100644 --- a/ci/docker/debian/Dockerfile +++ b/ci/docker/debian/Dockerfile @@ -1,7 +1,7 @@ -FROM debian:12 +FROM debian:trixie ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL sparse -ENV LLVM_VERSION 16 +ENV LLVM_VERSION 17 ENV RUST_VERSION 1.70 ENV PATH /opt/cargo/bin:$PATH diff --git a/ci/docker/fedora/Dockerfile b/ci/docker/fedora/Dockerfile index af7c32752..de197640d 100644 --- a/ci/docker/fedora/Dockerfile +++ b/ci/docker/fedora/Dockerfile @@ -1,7 +1,7 @@ -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:40 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL sparse -ENV LLVM_VERSION 16 +ENV LLVM_VERSION 17 ENV RUST_VERSION 1.70 ENV PATH /opt/cargo/bin:$PATH diff --git a/ci/docker/ubuntu/Dockerfile b/ci/docker/ubuntu/Dockerfile index 1a995a47f..47df4de63 100644 --- a/ci/docker/ubuntu/Dockerfile +++ b/ci/docker/ubuntu/Dockerfile @@ -1,7 +1,7 @@ -FROM ubuntu:23.04 +FROM ubuntu:24.04 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL sparse -ENV LLVM_VERSION 16 +ENV LLVM_VERSION 17 ENV RUST_VERSION 1.70 ENV PATH /opt/cargo/bin:$PATH diff --git a/ci/mac.sh b/ci/mac.sh index 831cb1678..7815d2630 100755 --- a/ci/mac.sh +++ b/ci/mac.sh @@ -2,7 +2,7 @@ set -e -LLVM_VERSION='16' +LLVM_VERSION='17' RUST_VERSION='1.70' echo "::group::Installing Homebrew packages"