Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Try to build on macos
Browse files Browse the repository at this point in the history
wwahammy committed Jan 2, 2025
1 parent 836329a commit 8aa2b1a
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/container-build.yml
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions container-build.py
Original file line number Diff line number Diff line change
@@ -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()

0 comments on commit 8aa2b1a

Please sign in to comment.