Skip to content

Commit

Permalink
Try revive macos-latest build -- fails for pybind code (#171)
Browse files Browse the repository at this point in the history
Co-authored-by: Ethan Rublee <[email protected]>
  • Loading branch information
Hackerman342 and ethanrublee authored Sep 30, 2023
1 parent 6f85b56 commit 6ace833
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest ] # macos not supported yet macos-latest
os: [ubuntu-latest, macos-latest]
python-version: [3.8]
steps:
- uses: actions/checkout@v3
Expand All @@ -24,7 +24,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: pip3 install -e .[dev]
run: pip3 install -vvv -e .[dev]
- name: Run sequential tests
run: ./run_python_tests.sh
- name: Run asyncio tests
Expand Down
28 changes: 26 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import os
import sys
from pathlib import Path

from farm_ng.package.commands import (
Expand All @@ -11,9 +13,31 @@

__version__ = "0.1.0"


platform_cxx_flags = []

if sys.platform.startswith("darwin"):
print("Running on macOS")
platform_cxx_flags = [
"-std=c++20",
"-mmacosx-version-min=11.0",
"-D_LIBCPP_DISABLE_DEPRECATION_WARNINGS=1",
]
os.environ["MACOSX_DEPLOYMENT_TARGET"] = "11.0"

elif sys.platform.startswith("linux"):
print("Running on Linux")
platform_cxx_flags = [
"-std=gnu++17",
"-fconcepts",
]
else:
print("Running on another operating system")

PROTO_ROOT: str = "protos"
PACKAGE_ROOT: str = "py"


BuildProtosDevelop.user_options.append(("proto-root=", None, PROTO_ROOT))
BuildProtosDevelop.user_options.append(("package-root=", None, PACKAGE_ROOT))

Expand Down Expand Up @@ -62,12 +86,12 @@
],
define_macros=[("VERSION_INFO", __version__)],
extra_compile_args=[
"-fconcepts",
*platform_cxx_flags,
"-Wall",
"-Wextra",
"-Werror",
"-Wno-unknown-warning-option",
"-Wno-unused-parameter",
"-std=gnu++17",
"-Wno-missing-field-initializers",
"-Wno-unused-but-set-variable",
"-Wno-unused-variable",
Expand Down

0 comments on commit 6ace833

Please sign in to comment.