From 52d14dc8add3b006248dd54caa8ac2c68cac5867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Thu, 5 Sep 2024 16:24:23 +0200
Subject: [PATCH] static: split artifacts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
---
 .github/workflows/.nightly.yml |  8 ++++----
 .github/workflows/nightly.yml  | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/.nightly.yml b/.github/workflows/.nightly.yml
index a3100dda71..5ec853e71b 100644
--- a/.github/workflows/.nightly.yml
+++ b/.github/workflows/.nightly.yml
@@ -42,7 +42,7 @@ jobs:
         run: |
           echo "version=$(date +%Y%m%d)" >> $GITHUB_OUTPUT
           case ${{ inputs.arch }} in
-              amd64|static)
+              amd64|static*|cross*)
               echo "worker=ubuntu-20.04" >> $GITHUB_OUTPUT
               ;;
               arm64|armhf)
@@ -78,10 +78,10 @@ jobs:
           export DOCKER_COMPOSE_REF=main
           export DOCKER_COMPOSE_VERSION=$VERSION
           
-          if [ "${{ inputs.target }}" == "static" ]; then
-              export DOCKER_BUILD_PKGS="static-linux cross-mac cross-win"
+          if [ "${{ inputs.target }}" == static ]; then
+              export DOCKER_BUILD_PKGS="${{ inputs.arch }}"
           else
-            export ARCH=${{ inputs.arch }}
+              export ARCH=${{ inputs.arch }}
           fi
           
           make ${{ inputs.target }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4230cada1f..f557f2e307 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -25,13 +25,17 @@ jobs:
                     #- {target: "rhel-8", image: "registry.access.redhat.com/ubi8/ubi"}
                     #- {target: "rhel-9", image: "registry.access.redhat.com/ubi9/ubi"}
                 include:
-                    - arch: static
+                    - arch: static-linux
                       dist: {target: "static", image: ""}
+                    - arch: cross-mac
+                      dist: {target: "static", image: ""}
+                    - arch: cross-win
+                      dist: {target: "static", image: ""}
+                    - arch: armhf
+                      dist: {target: "debian-bookworm", image: "debian:bookworm"}
                     #- arch: armhf
                     #  dist: {target: "debian-bullseye", image: "debian:bullseye"}
                     #- arch: armhf
-                    #  dist: {target: "debian-bookworm", image: "debian:bookworm"}
-                    #- arch: armhf
                     #  dist: {target: "ubuntu-focal", image: "ubuntu:focal"}
                     #- arch: armhf
                     #  dist: {target: "ubuntu-jammy", image: "ubuntu:jammy"}