From 2aa588bf0a3d72aaad459a5f4e599916dc5bd743 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 22 Oct 2022 21:41:49 +0200 Subject: [PATCH] ci/linker: update mold to 1.6 and enable on s390x Since 1.6 is s390x supported platform. Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/build-mold.sh | 2 +- .gitlab-ci/container/debian/s390x_build.sh | 11 +++++++++++ .gitlab-ci/image-tags.yml | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-mold.sh b/.gitlab-ci/container/build-mold.sh index c1dbe32..16159df 100644 --- a/.gitlab-ci/container/build-mold.sh +++ b/.gitlab-ci/container/build-mold.sh @@ -2,7 +2,7 @@ set -ex -MOLD_VERSION="1.5.0" +MOLD_VERSION="1.6.0" git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git cd mold diff --git a/.gitlab-ci/container/debian/s390x_build.sh b/.gitlab-ci/container/debian/s390x_build.sh index 38ca850..b1353a3 100644 --- a/.gitlab-ci/container/debian/s390x_build.sh +++ b/.gitlab-ci/container/debian/s390x_build.sh @@ -1,5 +1,16 @@ #!/bin/bash +set -e + arch=s390x +# Ephemeral packages (installed for this script and removed again at the end) +STABLE_EPHEMERAL="libssl-dev" + +apt-get -y install "$STABLE_EPHEMERAL" + +. .gitlab-ci/container/build-mold.sh + +apt-get purge -y "$STABLE_EPHEMERAL" + . .gitlab-ci/container/cross_build.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 02ae849..60347c4 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -3,7 +3,7 @@ variables: DEBIAN_BASE_TAG: "2022-10-19-remove-xvmc-dev" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" - DEBIAN_BUILD_TAG: "2022-10-18-dx-headers" + DEBIAN_BUILD_TAG: "2022-10-22-mold-1_6" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" DEBIAN_BUILD_MINGW_TAG: "2022-10-18-dx-headers-va" -- 2.7.4