[gentoo-commits] proj/releng:master commit in: tools/

[Andreas K. Hüttel]

commit:     4af672c29118e66f4fd45def97cde502a3750a15
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 21:36:23 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 21:36:23 2022 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=4af672c2

Add clang stages to autobuilds

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 tools/catalyst-auto-amd64.conf | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 401c640d..6e98d814 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -15,12 +15,14 @@ SETS="
        livegui
        nomultilib_openrc
        nomultilib_systemd
+       clang_openrc
        hardened_openrc
        hardened_nomultilib_openrc
        hardened_selinux_openrc
        hardened_nomultilib_selinux_openrc
        musl
        musl_hardened
+       musl_clang
        x32_openrc
 "
 
@@ -44,8 +46,12 @@ 
SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec har
 SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec 
nomultilib/stage3-openrc.spec"
 SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec 
nomultilib/stage3-systemd.spec"
 
+SET_clang_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
+
 SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
 
+SET_musl_clang_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
+
 SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
 
 SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
@@ -56,7 +62,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
 
 update_symlinks() {
        # Symlink the latest stages3 to build from
-       for d in 
${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl,musl-hardened} ; do
+       for d in 
${BUILD_SRCDIR_BASE}/builds/{default,clang,hardened,musl,musl-clang,musl-hardened}
 ; do
                pushd "${d}" >/dev/null || exit
                shopt -s extglob
                for f in $(ls stage3*${EXTENSIONS} | grep -v latest | 
give_latest_from_dates ) ; do
@@ -111,6 +117,14 @@ post_build() {
        esac
        popd >/dev/null || exit
 
+       pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
+       case ${spec} in
+       clang/stage3-openrc.spec)
+               upload stage3-amd64-clang-openrc-${TIMESTAMP}.tar.xz*
+               ;;
+       esac
+       popd >/dev/null || exit
+
        pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit
        case ${spec} in
        hardened/stage3-openrc.spec)
@@ -139,6 +153,14 @@ post_build() {
        esac
        popd >/dev/null || exit
 
+       pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
+       case ${spec} in
+       musl-clang/stage3.spec)
+               upload stage3-amd64-musl-clang-${TIMESTAMP}.tar.xz*
+               ;;
+       esac
+       popd >/dev/null || exit
+
        pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
        case ${spec} in
        musl-hardened/stage3.spec)