From 7b280d7b867cff2c84ea301fd4030d89d87c4930 Mon Sep 17 00:00:00 2001 From: Yan Song Liu Date: Mon, 15 Apr 2024 13:37:46 +0800 Subject: [PATCH 1/2] Add s390x docker build Signed-off-by: Yan Song Liu --- 1.77.2/bookworm/Dockerfile | 1 + 1.77.2/bookworm/slim/Dockerfile | 1 + 1.77.2/bullseye/Dockerfile | 1 + 1.77.2/bullseye/slim/Dockerfile | 1 + nightly/bookworm/Dockerfile | 1 + nightly/bookworm/slim/Dockerfile | 1 + nightly/bullseye/Dockerfile | 1 + nightly/bullseye/slim/Dockerfile | 1 + x.py | 1 + 9 files changed, 9 insertions(+) diff --git a/1.77.2/bookworm/Dockerfile b/1.77.2/bookworm/Dockerfile index 60574d9..2b643d1 100644 --- a/1.77.2/bookworm/Dockerfile +++ b/1.77.2/bookworm/Dockerfile @@ -15,6 +15,7 @@ RUN set -eux; \ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367' ;; \ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272' ;; \ ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='b152711fb15fd629f0d4c2731cbf9167e6352da0ffcb2210447d80c010180f96' ;; \ + s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='4ff9e7963ed0457e64cbb29d2b5a37496d1fa303f9300adc5251ee3c16bd3b30' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ url="https://static.rust-lang.org/rustup/archive/1.27.0/${rustArch}/rustup-init"; \ diff --git a/1.77.2/bookworm/slim/Dockerfile b/1.77.2/bookworm/slim/Dockerfile index f46e201..15f7303 100644 --- a/1.77.2/bookworm/slim/Dockerfile +++ b/1.77.2/bookworm/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367' ;; \ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272' ;; \ ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='b152711fb15fd629f0d4c2731cbf9167e6352da0ffcb2210447d80c010180f96' ;; \ + s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='4ff9e7963ed0457e64cbb29d2b5a37496d1fa303f9300adc5251ee3c16bd3b30' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ url="https://static.rust-lang.org/rustup/archive/1.27.0/${rustArch}/rustup-init"; \ diff --git a/1.77.2/bullseye/Dockerfile b/1.77.2/bullseye/Dockerfile index d9a0ceb..fa4d1ad 100644 --- a/1.77.2/bullseye/Dockerfile +++ b/1.77.2/bullseye/Dockerfile @@ -15,6 +15,7 @@ RUN set -eux; \ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367' ;; \ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272' ;; \ ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='b152711fb15fd629f0d4c2731cbf9167e6352da0ffcb2210447d80c010180f96' ;; \ + s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='4ff9e7963ed0457e64cbb29d2b5a37496d1fa303f9300adc5251ee3c16bd3b30' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ url="https://static.rust-lang.org/rustup/archive/1.27.0/${rustArch}/rustup-init"; \ diff --git a/1.77.2/bullseye/slim/Dockerfile b/1.77.2/bullseye/slim/Dockerfile index f0aea62..bc45d2c 100644 --- a/1.77.2/bullseye/slim/Dockerfile +++ b/1.77.2/bullseye/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367' ;; \ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272' ;; \ ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='b152711fb15fd629f0d4c2731cbf9167e6352da0ffcb2210447d80c010180f96' ;; \ + s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='4ff9e7963ed0457e64cbb29d2b5a37496d1fa303f9300adc5251ee3c16bd3b30' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ url="https://static.rust-lang.org/rustup/archive/1.27.0/${rustArch}/rustup-init"; \ diff --git a/nightly/bookworm/Dockerfile b/nightly/bookworm/Dockerfile index 1e26fba..ac72da5 100644 --- a/nightly/bookworm/Dockerfile +++ b/nightly/bookworm/Dockerfile @@ -15,6 +15,7 @@ RUN set -eux; \ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367' ;; \ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272' ;; \ ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='b152711fb15fd629f0d4c2731cbf9167e6352da0ffcb2210447d80c010180f96' ;; \ + s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='4ff9e7963ed0457e64cbb29d2b5a37496d1fa303f9300adc5251ee3c16bd3b30' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ url="https://static.rust-lang.org/rustup/archive/1.27.0/${rustArch}/rustup-init"; \ diff --git a/nightly/bookworm/slim/Dockerfile b/nightly/bookworm/slim/Dockerfile index 34db541..10cb9c5 100644 --- a/nightly/bookworm/slim/Dockerfile +++ b/nightly/bookworm/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367' ;; \ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272' ;; \ ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='b152711fb15fd629f0d4c2731cbf9167e6352da0ffcb2210447d80c010180f96' ;; \ + s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='4ff9e7963ed0457e64cbb29d2b5a37496d1fa303f9300adc5251ee3c16bd3b30' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ url="https://static.rust-lang.org/rustup/archive/1.27.0/${rustArch}/rustup-init"; \ diff --git a/nightly/bullseye/Dockerfile b/nightly/bullseye/Dockerfile index 5385b76..471d878 100644 --- a/nightly/bullseye/Dockerfile +++ b/nightly/bullseye/Dockerfile @@ -15,6 +15,7 @@ RUN set -eux; \ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367' ;; \ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272' ;; \ ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='b152711fb15fd629f0d4c2731cbf9167e6352da0ffcb2210447d80c010180f96' ;; \ + s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='4ff9e7963ed0457e64cbb29d2b5a37496d1fa303f9300adc5251ee3c16bd3b30' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ url="https://static.rust-lang.org/rustup/archive/1.27.0/${rustArch}/rustup-init"; \ diff --git a/nightly/bullseye/slim/Dockerfile b/nightly/bullseye/slim/Dockerfile index be515c7..0489b35 100644 --- a/nightly/bullseye/slim/Dockerfile +++ b/nightly/bullseye/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367' ;; \ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272' ;; \ ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='b152711fb15fd629f0d4c2731cbf9167e6352da0ffcb2210447d80c010180f96' ;; \ + s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='4ff9e7963ed0457e64cbb29d2b5a37496d1fa303f9300adc5251ee3c16bd3b30' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ url="https://static.rust-lang.org/rustup/archive/1.27.0/${rustArch}/rustup-init"; \ diff --git a/x.py b/x.py index 03f3920..58e726e 100755 --- a/x.py +++ b/x.py @@ -21,6 +21,7 @@ debian_non_buster_arches = [ DebianArch("ppc64le", "ppc64el", "linux/ppc64le", "powerpc64le-unknown-linux-gnu"), + DebianArch("s390x", "s390x", "linux/s390x", "s390x-unknown-linux-gnu"), ] debian_variants = [ From 0dab7917d84bbbc1bdf25ea396497a2b8fc924e4 Mon Sep 17 00:00:00 2001 From: Yan Song Liu Date: Mon, 15 Apr 2024 13:43:36 +0800 Subject: [PATCH 2/2] enable s390x nightly build Signed-off-by: Yan Song Liu --- .github/workflows/nightly.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 73106c3..08eb5ff 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -33,23 +33,23 @@ jobs: nightly-buster-slim - name: bullseye context: nightly/bullseye - platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le + platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x tags: | nightly-bullseye - name: slim-bullseye context: nightly/bullseye/slim - platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le + platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x tags: | nightly-bullseye-slim - name: bookworm context: nightly/bookworm - platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le + platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x tags: | nightly-bookworm nightly - name: slim-bookworm context: nightly/bookworm/slim - platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le + platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x tags: | nightly-bookworm-slim nightly-slim