From 5dec4b8e3755bcc0be27fb43bd20880d6da1c42b Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Sat, 6 Jan 2024 09:56:47 -0500 Subject: ci: drop custom Cross images It looks like these aren't needed any more? I'm not sure why to be honest. I suspect it's because we no longer need asciidoc(tor)? to generate man pages. And I believe tests that require things like `zstd` are automatically if `zstd` isn't installed. --- Cross.toml | 14 -------------- ci/docker/README.md | 23 ----------------------- ci/docker/aarch64-unknown-linux-gnu/Dockerfile | 4 ---- ci/docker/aarch64-unknown-linux-gnu/build | 5 ----- ci/docker/i686-unknown-linux-gnu/Dockerfile | 4 ---- ci/docker/i686-unknown-linux-gnu/build | 5 ----- ci/docker/powerpc64-unknown-linux-gnu/Dockerfile | 4 ---- ci/docker/powerpc64-unknown-linux-gnu/build | 5 ----- ci/docker/s390x-unknown-linux-gnu/Dockerfile | 4 ---- ci/docker/s390x-unknown-linux-gnu/build | 5 ----- ci/docker/x86_64-unknown-linux-musl/Dockerfile | 4 ---- ci/docker/x86_64-unknown-linux-musl/build | 5 ----- 12 files changed, 82 deletions(-) delete mode 100644 Cross.toml delete mode 100644 ci/docker/README.md delete mode 100644 ci/docker/aarch64-unknown-linux-gnu/Dockerfile delete mode 100755 ci/docker/aarch64-unknown-linux-gnu/build delete mode 100644 ci/docker/i686-unknown-linux-gnu/Dockerfile delete mode 100755 ci/docker/i686-unknown-linux-gnu/build delete mode 100644 ci/docker/powerpc64-unknown-linux-gnu/Dockerfile delete mode 100755 ci/docker/powerpc64-unknown-linux-gnu/build delete mode 100644 ci/docker/s390x-unknown-linux-gnu/Dockerfile delete mode 100755 ci/docker/s390x-unknown-linux-gnu/build delete mode 100644 ci/docker/x86_64-unknown-linux-musl/Dockerfile delete mode 100755 ci/docker/x86_64-unknown-linux-musl/build diff --git a/Cross.toml b/Cross.toml deleted file mode 100644 index b334e5db..00000000 --- a/Cross.toml +++ /dev/null @@ -1,14 +0,0 @@ -[target.x86_64-unknown-linux-musl] -image = "burntsushi/cross:x86_64-unknown-linux-musl" - -[target.i686-unknown-linux-gnu] -image = "burntsushi/cross:i686-unknown-linux-gnu" - -[target.aarch64-unknown-linux-gnu] -image = "burntsushi/cross:aarch64-unknown-linux-gnu" - -[target.powerpc64-unknown-linux-gnu] -image = "burntsushi/cross:powerpc64-unknown-linux-gnu" - -[target.s390x-unknown-linux-gnu] -image = "burntsushi/cross:s390x-unknown-linux-gnu" diff --git a/ci/docker/README.md b/ci/docker/README.md deleted file mode 100644 index 19913e02..00000000 --- a/ci/docker/README.md +++ /dev/null @@ -1,23 +0,0 @@ -These are Docker images used for cross compilation in CI builds (or locally) -via the [Cross](https://github.com/rust-embedded/cross) tool. - -The Cross tool actually provides its own Docker images, and all Docker images -in this directory are derived from one of them. We provide our own in order to -customize the environment. For example, we need to install compression tools -like `xz` so that tests for the `-z/--search-zip` flag are run. - -If you make a change to a Docker image, then you can re-build it. `cd` into the -directory containing the `Dockerfile` and run: - - $ cd x86_64-unknown-linux-musl - $ ./build - -At this point, subsequent uses of `cross` will now use your built image since -Docker prefers local images over remote images. In order to make these changes -stick, they need to be pushed to Docker Hub: - - $ docker push burntsushi/cross:x86_64-unknown-linux-musl - -Of course, only I (BurntSushi) can push to that location. To make `cross` use -a different location, then edit `Cross.toml` in the root of this repo to use -a different image name for the desired target. diff --git a/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/ci/docker/aarch64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 0b40440f..00000000 --- a/ci/docker/aarch64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM rustembedded/cross:aarch64-unknown-linux-gnu - -COPY stage/ubuntu-install-packages / -RUN /ubuntu-install-packages diff --git a/ci/docker/aarch64-unknown-linux-gnu/build b/ci/docker/aarch64-unknown-linux-gnu/build deleted file mode 100755 index f32c3133..00000000 --- a/ci/docker/aarch64-unknown-linux-gnu/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mkdir -p stage -cp ../../ubuntu-install-packages ./stage/ -docker build -t burntsushi/cross:aarch64-unknown-linux-gnu . diff --git a/ci/docker/i686-unknown-linux-gnu/Dockerfile b/ci/docker/i686-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 9c9107ea..00000000 --- a/ci/docker/i686-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM rustembedded/cross:i686-unknown-linux-gnu - -COPY stage/ubuntu-install-packages / -RUN /ubuntu-install-packages diff --git a/ci/docker/i686-unknown-linux-gnu/build b/ci/docker/i686-unknown-linux-gnu/build deleted file mode 100755 index 5837c828..00000000 --- a/ci/docker/i686-unknown-linux-gnu/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mkdir -p stage -cp ../../ubuntu-install-packages ./stage/ -docker build -t burntsushi/cross:i686-unknown-linux-gnu . diff --git a/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 9489aa2c..00000000 --- a/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM rustembedded/cross:powerpc64-unknown-linux-gnu - -COPY stage/ubuntu-install-packages / -RUN /ubuntu-install-packages diff --git a/ci/docker/powerpc64-unknown-linux-gnu/build b/ci/docker/powerpc64-unknown-linux-gnu/build deleted file mode 100755 index b25960c2..00000000 --- a/ci/docker/powerpc64-unknown-linux-gnu/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mkdir -p stage -cp ../../ubuntu-install-packages ./stage/ -docker build -t burntsushi/cross:powerpc64-unknown-linux-gnu . diff --git a/ci/docker/s390x-unknown-linux-gnu/Dockerfile b/ci/docker/s390x-unknown-linux-gnu/Dockerfile deleted file mode 100644 index 65a20876..00000000 --- a/ci/docker/s390x-unknown-linux-gnu/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM rustembedded/cross:s390x-unknown-linux-gnu - -COPY stage/ubuntu-install-packages / -RUN /ubuntu-install-packages diff --git a/ci/docker/s390x-unknown-linux-gnu/build b/ci/docker/s390x-unknown-linux-gnu/build deleted file mode 100755 index f2fcb438..00000000 --- a/ci/docker/s390x-unknown-linux-gnu/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mkdir -p stage -cp ../../ubuntu-install-packages ./stage/ -docker build -t burntsushi/cross:s390x-unknown-linux-gnu . diff --git a/ci/docker/x86_64-unknown-linux-musl/Dockerfile b/ci/docker/x86_64-unknown-linux-musl/Dockerfile deleted file mode 100644 index 8818b605..00000000 --- a/ci/docker/x86_64-unknown-linux-musl/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM rustembedded/cross:x86_64-unknown-linux-musl - -COPY stage/ubuntu-install-packages / -RUN /ubuntu-install-packages diff --git a/ci/docker/x86_64-unknown-linux-musl/build b/ci/docker/x86_64-unknown-linux-musl/build deleted file mode 100755 index 7fce7c2a..00000000 --- a/ci/docker/x86_64-unknown-linux-musl/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mkdir -p stage -cp ../../ubuntu-install-packages ./stage/ -docker build -t burntsushi/cross:x86_64-unknown-linux-musl . -- cgit v1.2.3