Fix MacOS CI (#2145)

* compile flag for cython

* fix more setups

* bump cereal

* reenable mac build

* don't let that fail the build

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
pull/2265/head
Willem Melching 5 years ago committed by GitHub
parent 06cb2f963d
commit 8e0bb6a7ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 48
      .github/workflows/test.yaml
  2. 2
      common/common_pyx_setup.py
  3. 4
      common/kalman/simple_kalman_setup.py
  4. 2
      common/transformations/setup.py
  5. 2
      selfdrive/boardd/boardd_setup.py

@ -52,30 +52,30 @@ jobs:
scons -j$(nproc) && \ scons -j$(nproc) && \
$UNIT_TEST selfdrive/car" $UNIT_TEST selfdrive/car"
#build_mac: build_mac:
# name: build macos name: build macos
# runs-on: macos-10.15 runs-on: macos-10.15
# timeout-minutes: 60 timeout-minutes: 60
# steps: steps:
# - uses: actions/checkout@v2 - uses: actions/checkout@v2
# with: with:
# submodules: true submodules: true
# - name: Cache dependencies - name: Cache dependencies
# id: dependency-cache id: dependency-cache
# uses: actions/cache@v2 uses: actions/cache@v2
# with: with:
# path: | path: |
# ~/.pyenv ~/.pyenv
# ~/Library/Caches/pip ~/Library/Caches/pip
# ~/Library/Caches/pipenv ~/Library/Caches/pipenv
# ~/Library/Caches/Homebrew ~/Library/Caches/Homebrew
# key: ${{ hashFiles('tools/mac_setup.sh') }} key: ${{ hashFiles('tools/mac_setup.sh') }}
# - name: Install dependencies - name: Install dependencies
# run: ./tools/mac_setup.sh run: ./tools/mac_setup.sh
# - name: Build openpilot - name: Build openpilot
# run: eval "$(pyenv init -)" && scons -j$(nproc) run: eval "$(pyenv init -)" && scons -j$(nproc)
# - name: Brew cleanup - name: Brew cleanup
# run: brew cleanup # keeps our cache small run: brew cleanup || true # keeps our cache small
docker_push: docker_push:
name: docker push name: docker push

@ -4,7 +4,7 @@ from Cython.Build import cythonize
from common.cython_hacks import BuildExtWithoutPlatformSuffix from common.cython_hacks import BuildExtWithoutPlatformSuffix
sourcefiles = ['clock.pyx'] sourcefiles = ['clock.pyx']
extra_compile_args = ["-std=c++11"] extra_compile_args = ["-std=c++11", "-Wno-nullability-completeness"]
setup(name='Common', setup(name='Common',
cmdclass={'build_ext': BuildExtWithoutPlatformSuffix}, cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},

@ -6,4 +6,6 @@ from common.cython_hacks import BuildExtWithoutPlatformSuffix
setup(name='Simple Kalman Implementation', setup(name='Simple Kalman Implementation',
cmdclass={'build_ext': BuildExtWithoutPlatformSuffix}, cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},
ext_modules=cythonize(Extension("simple_kalman_impl", ["simple_kalman_impl.pyx"]))) ext_modules=cythonize(Extension("simple_kalman_impl",
["simple_kalman_impl.pyx"],
extra_compile_args=["-Wno-nullability-completeness"])))

@ -36,7 +36,7 @@ setup(
"transformations", "transformations",
sources=["transformations.pyx"], sources=["transformations.pyx"],
language="c++", language="c++",
extra_compile_args=["-std=c++14"], extra_compile_args=["-std=c++14", "-Wno-nullability-completeness"],
include_dirs=[numpy.get_include()], include_dirs=[numpy.get_include()],
) )
)) ))

@ -16,7 +16,7 @@ setup(name='Boardd API Implementation',
], ],
sources=['boardd_api_impl.pyx'], sources=['boardd_api_impl.pyx'],
language="c++", language="c++",
extra_compile_args=["-std=c++11"], extra_compile_args=["-std=c++11", "-Wno-nullability-completeness"],
) )
) )
) )

Loading…
Cancel
Save