diff --git a/.github/workflows/cache_docker.yml b/.github/workflows/cache_docker.yml index a80a7a21734e9..1700c416153d6 100644 --- a/.github/workflows/cache_docker.yml +++ b/.github/workflows/cache_docker.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - distro: [groovy, jammy, noble, oracular] + distro: [focal, jammy, noble, oracular] dart_version: [v6.14] platforms: ["linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"] build_min: [OFF] diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 1d69bc38cabef..9b5c61a21c4bc 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: # Supported LTS versions - os: [ubuntu-groovy, ubuntu-jammy, ubuntu-noble] + os: [ubuntu-focal, ubuntu-jammy, ubuntu-noble] build_type: [Release] codecov: [OFF] check_format: [OFF] diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.groovy b/docker/dev/v6.14/Dockerfile.ubuntu.focal similarity index 97% rename from docker/dev/v6.14/Dockerfile.ubuntu.groovy rename to docker/dev/v6.14/Dockerfile.ubuntu.focal index 6f3d6d60ef261..bfd4ba1137aca 100644 --- a/docker/dev/v6.14/Dockerfile.ubuntu.groovy +++ b/docker/dev/v6.14/Dockerfile.ubuntu.focal @@ -1,5 +1,5 @@ ARG TARGETPLATFORM=linux/amd64 -FROM --platform=$TARGETPLATFORM ubuntu:groovy +FROM --platform=$TARGETPLATFORM ubuntu:focal ARG DEBIAN_FRONTEND=noninteractive @@ -15,7 +15,6 @@ RUN apt-get update -qq RUN apt-get install -y --no-install-recommends \ build-essential \ clang \ - clang-format-14 \ cmake \ curl \ doxygen \