From 8aa2b1a2166f18ee801f28ac7ac4969d81fa1c63 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 2 Jan 2025 13:40:32 -0600 Subject: [PATCH] Try to build on macos --- .github/workflows/container-build.yml | 4 ++-- container-build.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index 1ce225948..3cf4d812b 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -7,7 +7,7 @@ jobs: build_and_test: strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest] builder: ["podman"] fail-fast: false runs-on: ${{ matrix.os }} @@ -24,5 +24,5 @@ jobs: # sudo apt install -y podman - uses: actions/checkout@v4 - name: Make on Unix - run: ./container-build.py make -d fast + run: python ./container-build.py make -d fast diff --git a/container-build.py b/container-build.py index b347bddaa..65d928d62 100755 --- a/container-build.py +++ b/container-build.py @@ -22,9 +22,9 @@ def runProcess(exe): parser = argparse.ArgumentParser(description='Build Sandstorm using an Ubuntu 20.04 Docker/OCI container') -parser.add_argument("action", choices=["make", "prepare", "shell"], default="make", nargs="?") -parser.add_argument('--container-builder', dest="container_builder", default='podman', help='Command you run for building container from command line') -parser.add_argument('--container-runner', dest="container_runner", default='podman', help='Command you run for running container from command line') +parser.add_argument("action", choices=["make", "prepare", "shell"], default="make", nargs="?", help='') +parser.add_argument('--container-builder', dest="container_builder", default='podman', help='Command you run for building container from command line (Default: %(default))') +parser.add_argument('--container-runner', dest="container_runner", default='podman', help='Command you run for running container from command line (Default: %(default))') parser.add_argument('args', nargs=argparse.REMAINDER) args = parser.parse_args()