ci: Add macos.yaml using the build-cln.yaml flow

Author: cdecker

.github/workflows/build-cln.yaml

@@ -31,6 +31,11 @@ on:
         required: false
         type: string
         default: ''
+      os:
+        description: 'Operating system (ubuntu-22.04 or macos-14)'
+        required: false
+        type: string
+        default: 'ubuntu-22.04'
 
 env:
   RUST_PROFILE: release
@@ -39,7 +44,7 @@ env:
 jobs:
   build:
     name: Build CLN ${{ inputs.cfg }}
-    runs-on: ubuntu-22.04
+    runs-on: ${{ inputs.os }}
     timeout-minutes: 30
     steps:
       - name: Checkout
@@ -53,10 +58,21 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v5
 
-      - name: Install dependencies
+      - name: Install dependencies (Linux)
+        if: ${{ inputs.os == 'ubuntu-22.04' }}
         run: |
           bash -x .github/scripts/setup.sh
 
+      - name: Install dependencies (macOS)
+        if: ${{ startsWith(inputs.os, 'macos-') }}
+        env:
+          GRPC_PYTHON_BUILD_SYSTEM_OPENSSL: 1
+          GRPC_PYTHON_BUILD_SYSTEM_ZLIB: 1
+        run: |
+          export PATH="/usr/local/opt:/Users/runner/.local/bin:/opt/homebrew/bin/python3.10/bin:$PATH"
+          brew install gnu-sed autoconf automake libtool protobuf openssl lowdown libsodium
+          uv sync --all-groups
+
       - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
@@ -69,9 +85,25 @@ jobs:
           COMPAT: 1
           CFG: ${{ inputs.cfg }}
           RUSTC_WRAPPER: sccache
+          # macOS-specific environment variables
+          CPATH: ${{ startsWith(inputs.os, 'macos-') && '/opt/homebrew/include' || '' }}
+          LIBRARY_PATH: ${{ startsWith(inputs.os, 'macos-') && '/opt/homebrew/lib' || '' }}
+          GRPC_PYTHON_BUILD_SYSTEM_OPENSSL: ${{ startsWith(inputs.os, 'macos-') && '1' || '' }}
+          GRPC_PYTHON_BUILD_SYSTEM_ZLIB: ${{ startsWith(inputs.os, 'macos-') && '1' || '' }}
         run: |
           set -e
-          ./configure --enable-debugbuild CC="sccache $COMPILER" ${{ inputs.coptflags }}
+
+          # Determine configure flags based on OS
+          if [[ "${{ inputs.os }}" == ubuntu-* ]]; then
+            CONFIGURE_FLAGS="--enable-debugbuild"
+            CC_WRAPPER="sccache $COMPILER"
+          else
+            # macOS: disable valgrind (not available) and compat
+            CONFIGURE_FLAGS="--disable-valgrind --disable-compat"
+            CC_WRAPPER="$COMPILER"
+          fi
+
+          ./configure $CONFIGURE_FLAGS CC="$CC_WRAPPER" ${{ inputs.coptflags }}
 
           uv run make -j $(nproc) testpack.tar.bz2
 
@@ -83,7 +115,8 @@ jobs:
           RUSTC_WRAPPER: sccache
         run: cargo test --all
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
         with:
           name: cln-${{ inputs.cfg }}.tar.bz2
           path: cln-${{ inputs.cfg }}.tar.bz2

.github/workflows/macos.yaml

@@ -2,11 +2,22 @@
 name: Mac OS pytest
 on:
   pull_request:
+  workflow_dispatch:
 jobs:
+  build-macos:
+    name: Build CLN (macOS)
+    uses: ./.github/workflows/build-cln.yaml
+    with:
+      cfg: macos-clang
+      compiler: clang
+      os: macos-14
+
   smoke-test:
     name: Smoke Test macOS
     runs-on: macos-14
     timeout-minutes: 120
+    needs:
+      - build-macos
     strategy:
       fail-fast: true
       matrix:
@@ -25,32 +36,13 @@ jobs:
           sudo mv bitcoin-${BITCOIND_VERSION}/bin/* /usr/local/bin
           rm -rf bitcoin-${BITCOIND_VERSION}-${TARGET_ARCH}.tar.gz bitcoin-${BITCOIND_VERSION}
 
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
+      - name: Download build
+        uses: actions/download-artifact@v4
         with:
-          python-version: "3.10"
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-
-      - name: Install dependencies
-        run: |
-          export PATH="/usr/local/opt:/Users/runner/.local/bin:/opt/homebrew/bin/python3.10/bin:$PATH"
-
-          brew install gnu-sed autoconf automake libtool protobuf openssl lowdown libsodium
-
-          # https://github.com/grpc/grpc/issues/31737#issuecomment-1323796842
-          export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-          export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-          uv sync --all-groups
-
-      - name: Build and install CLN
-        run: |
-          export CPATH=/opt/homebrew/include
-          export LIBRARY_PATH=/opt/homebrew/lib
+          name: cln-macos-clang.tar.bz2
 
-          uv run ./configure --disable-valgrind --disable-compat
-          uv run make
+      - name: Unpack CLN
+        run: tar -xaf cln-macos-clang.tar.bz2
 
       - name: Start bitcoind in regtest mode
         run: |