commit: be134c18a8e83ef52f900affed5ec412cca11107
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 3 21:51:39 2025 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Oct 3 21:51:39 2025 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=be134c18
Hook up WSL builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 16 ++++++++++++----
tools/catalyst-auto-arm64.conf | 11 ++++++++++-
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 0dc32c1f..563573a0 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -32,15 +32,15 @@ SETS="
# 23.0
-SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
-SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec installcd-stage1.spec
installcd-stage2-minimal.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec
stage3d-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec stage4w-openrc-23.spec"
SET_livegui_23_OPTIONAL_SPECS="livegui/livegui-stage1.spec
livegui/livegui-stage2.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
-SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
-SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec"
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec
stage3d-systemd-23.spec"
+SET_systemd_23_OPTIONAL_SPECS="stage4w-systemd-23.spec"
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec
hardened/stage3-openrc-23.spec"
@@ -111,6 +111,10 @@ post_build() {
upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
;;
+ stage4w-openrc-23.spec)
+ upload stage4-amd64-wsl-openrc-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
+ ;;
stage3-systemd-23.spec)
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
@@ -119,6 +123,10 @@ post_build() {
upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
;;
+ stage4w-systemd-23.spec)
+ upload stage4-amd64-wsl-systemd-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
+ ;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index bd34b267..bb72f730 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -19,11 +19,12 @@ SETS="
"
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec
stage3d-openrc-23.spec"
-SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
+SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec stage4w-openrc-23.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec
stage3d-systemd-23.spec"
+SET_systemd_23_OPTIONAL_SPECS="stage4w-systemd-23.spec"
SET_diskimage_23_SPECS="diskimage-stage1-console.spec
diskimage-stage2-console.spec diskimage-stage1-cloudinit.spec
diskimage-stage2-cloudinit.spec"
@@ -69,6 +70,10 @@ post_build() {
upload stage3-${SUBARCH}-desktop-openrc-${TIMESTAMP}*.xz*
# do not upsync_binpackages, done by extra builder
;;
+ stage4w-openrc-23.spec)
+ upload stage4-${SUBARCH}-wsl-openrc-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
+ ;;
stage3-systemd-23.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
# do not upsync_binpackages, done by extra builder
@@ -77,6 +82,10 @@ post_build() {
upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
# do not upsync_binpackages, done by extra builder
;;
+ stage4w-systemd-23.spec)
+ upload stage4-${SUBARCH}-wsl-systemd-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
+ ;;
installcd-stage2-minimal.spec)
upload install-arm64-*${TIMESTAMP}*.iso*
;;
