From 4cefefabf8712baa12215ffa2b777ffe1f2e5420 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <sorin.sbarnea@gmail.com>
Date: Wed, 6 Mar 2024 15:14:08 +0000
Subject: [PATCH] WIP: experiment using macos builders

---
 .github/workflows/task.yml | 14 ++++++++++----
 _build/test-setup.sh       |  6 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/task.yml b/.github/workflows/task.yml
index 4a92b71..e2b12f2 100644
--- a/.github/workflows/task.yml
+++ b/.github/workflows/task.yml
@@ -13,8 +13,8 @@ concurrency:
 
 jobs:
   task:
-    name: ${{ matrix.command }}
-    runs-on: ubuntu-22.04
+    name: ${{ matrix.name || matrix.command }}
+    runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
@@ -22,11 +22,17 @@ jobs:
         command:
           - lint
           - build
-
+        os:
+          - ubuntu-22.04
+        include:
+          - command: build
+            os: macos-14
+            name: build@macos
     env:
       # We use this option only on release pipeline due to the heavy cost
-      EXTRA_OPTS: --platform=linux/amd64,linux/arm64
+      EXTRA_OPTS: ""
       EXPECTED_IMAGES: 2
+      SKIP_PODMAN: 1
 
     steps:
       - name: Grab the source from Git
diff --git a/_build/test-setup.sh b/_build/test-setup.sh
index a86545a..9e7c7c5 100755
--- a/_build/test-setup.sh
+++ b/_build/test-setup.sh
@@ -3,7 +3,7 @@
 # This tool is used to setup the environment for running the tests. Its name
 # name and location is based on Zuul CI, which can automatically run it.
 # (cspell: disable-next-line)
-set -euo pipefail
+set -euxo pipefail
 
 PIP_LOG_FILE=out/log/pip.log
 HOSTNAME="${HOSTNAME:-localhost}"
@@ -149,8 +149,8 @@ if [[ "${PODMAN_VERSION}" != 'null' ]] && [[ "${SKIP_PODMAN:-}" != '1' ]]; then
     fi
 fi
 # verify podman ability to execute multi-arch commands:
-podman run --arch=arm64 -qit bash arch
-podman run --arch=amd64 -qit bash arch
+# podman run --arch=arm64 -qit bash arch
+# podman run --arch=amd64 -qit bash arch
 
 # Create a build manifest so we can compare between builds and machines, this
 # also has the role of ensuring that the required executables are present.