Fix python build for Mac
@@ -333,7 +333,10 @@ jobs:
build_macos_wheels:
name: Build wheels on MacOS
- runs-on: macos-11
+ # Build on 10.15 so we can still build a 3.6 wheel.
+ # May have to drop once github actions switches to macos-11 by default
+ # because 3.6 isn't supported on 11.
+ runs-on: macos-10.15
needs: [version, macos_libs]
env:
# Skip Python 2.7 and Python 3.5
@@ -549,10 +552,10 @@ jobs:
python test.py
working-directory: test
- validate_python_macos:
+ validate_python_macos_old:
name: Test python ${{ matrix.python-version }} on MacOS
needs: [build_macos_wheels]
- runs-on: macos-11
+ runs-on: macos-10.15
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
@@ -575,6 +578,33 @@ jobs:
python test.py
working-directory: test
+ validate_python_macos_11:
+ name: Test python ${{ matrix.python-version }} on MacOS
+ needs: [build_macos_wheels]
+ runs-on: macos-11
+ strategy:
+ matrix:
+ # There is no python 3.6 for macos-11
+ python-version: [3.7, 3.8, 3.9]
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set version env
+ id: version
+ run: echo "::set-output name=oso_version::$(cat VERSION)"
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v1
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Download oso python wheels from package run
+ uses: actions/download-artifact@v1
+ with:
+ name: wheel
+ - name: "test"
+ run: |
+ pip install oso==${{ steps.version.outputs.oso_version }} -f ../wheel
+ python test.py
+ working-directory: test
+
validate_python_windows:
name: Test python ${{ matrix.python-version }} on Windows
needs: [build_windows_wheels]
@@ -781,7 +811,8 @@ jobs:
build_gem,
build_go,
validate_python_linux,
- validate_python_macos,
+ validate_python_macos_old,
+ validate_python_macos_11,
validate_python_windows,
validate_python_musl,
validate_ruby,
@@ -922,7 +953,8 @@ jobs:
needs:
[
validate_python_linux,
- validate_python_macos,
+ validate_python_macos_old,
+ validate_python_macos_11,
validate_python_windows,
validate_python_musl,
validate_ruby,
