diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84c8be7..9e416ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,10 +24,6 @@ jobs: matrix: include: #VERSIONS - - name: buster - variant: buster - - name: slim-buster - variant: buster/slim - name: bullseye variant: bullseye - name: slim-bullseye diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1fc5948..69ebb7f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -21,16 +21,6 @@ jobs: matrix: include: #VERSIONS - - name: buster - context: nightly/buster - platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386 - tags: | - nightly-buster - - name: slim-buster - context: nightly/buster/slim - platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386 - tags: | - nightly-buster-slim - name: bullseye context: nightly/bullseye platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x diff --git a/1.79.0/buster/Dockerfile b/1.79.0/buster/Dockerfile deleted file mode 100644 index ddf6a30..0000000 --- a/1.79.0/buster/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM buildpack-deps:buster - -LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust - -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.79.0 - -RUN set -eux; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ - i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237' ;; \ - *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ - esac; \ - url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init"; \ - wget "$url"; \ - echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ - rustup --version; \ - cargo --version; \ - rustc --version; diff --git a/1.79.0/buster/slim/Dockerfile b/1.79.0/buster/slim/Dockerfile deleted file mode 100644 index 398b454..0000000 --- a/1.79.0/buster/slim/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM debian:buster-slim - -LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust - -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.79.0 - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - gcc \ - libc6-dev \ - wget \ - ; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ - i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237' ;; \ - *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ - esac; \ - url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init"; \ - wget "$url"; \ - echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ - rustup --version; \ - cargo --version; \ - rustc --version; \ - apt-get remove -y --auto-remove \ - wget \ - ; \ - rm -rf /var/lib/apt/lists/*; diff --git a/x.py b/x.py index 874d0d7..ff20d8c 100755 --- a/x.py +++ b/x.py @@ -17,15 +17,11 @@ DebianArch("arm32v7", "armhf", "linux/arm/v7", "armv7-unknown-linux-gnueabihf"), DebianArch("arm64v8", "arm64", "linux/arm64", "aarch64-unknown-linux-gnu"), DebianArch("i386", "i386", "linux/386", "i686-unknown-linux-gnu"), -] - -debian_non_buster_arches = [ DebianArch("ppc64le", "ppc64el", "linux/ppc64le", "powerpc64le-unknown-linux-gnu"), DebianArch("s390x", "s390x", "linux/s390x", "s390x-unknown-linux-gnu"), ] debian_variants = [ - "buster", "bullseye", "bookworm", ] @@ -77,11 +73,6 @@ def update_debian(): for variant in debian_variants: case = arch_case - if variant != "buster": - for arch in debian_non_buster_arches: - hash = rustup_hash(arch.rust) - case += f" {arch.dpkg}) rustArch='{arch.rust}'; rustupSha256='{hash}' ;; \\\n" - case += end for rust_version in supported_rust_versions: @@ -153,9 +144,6 @@ def update_nightly_ci(): platforms = [] for arch in debian_arches: platforms.append(f"{arch.qemu}") - if variant != "buster": - for arch in debian_non_buster_arches: - platforms.append(f"{arch.qemu}") platforms = ",".join(platforms) tags = [f"nightly-{variant}"] @@ -243,8 +231,6 @@ def generate_stackbrew_library(): tags.append("latest") arches = debian_arches[:] - if variant != "buster": - arches += debian_non_buster_arches library += single_library( tags,