Skip to content

Commit b2a8cb9

Browse files
authored
Merge pull request #37 from pycompression/macosm1
Test both x86 and M1 macos
2 parents e42d493 + 39b8832 commit b2a8cb9

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ jobs:
6262
- "pypy-3.10"
6363
os: ["ubuntu-latest"]
6464
include:
65-
- os: "macos-latest"
65+
- os: "macos-latest" # For m1 macos
66+
python-version: "3.8"
67+
- os: "macos-13" # for x86 macos
6668
python-version: "3.8"
6769
- os: "windows-latest"
6870
python-version: "3.8"

setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ def build_zlib_ng():
105105
run_args = dict(cwd=build_dir, env=build_env)
106106
if sys.platform == "darwin": # Cmake does not work properly
107107
subprocess.run([os.path.join(build_dir, "configure")], **run_args)
108-
subprocess.run(["gmake", "libz-ng.a"], **run_args)
108+
make_program = "gmake" if shutil.which("gmake") else "make"
109+
subprocess.run([make_program, "libz-ng.a"], **run_args)
109110
elif sys.platform == "linux":
110111
subprocess.run([os.path.join(build_dir, "configure")], **run_args)
111112
subprocess.run(["make", "libz-ng.a", "-j", str(cpu_count)], **run_args)

0 commit comments

Comments
 (0)