Skip to content

Commit

Permalink
remove more references to macos-12
Browse files Browse the repository at this point in the history
  • Loading branch information
galabovaa committed Oct 29, 2024
1 parent c937a50 commit cec527d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 38 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-nuget-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ concurrency:
cancel-in-progress: true

jobs:
# macos 12 is Intel
build_macos_12:
runs-on: macos-latest
# macos 13 is Intel
build_macos_13:
runs-on: macos-13
# strategy:
# matrix:
# python: [3.11]
Expand All @@ -32,7 +32,7 @@ jobs:
name: macos-x64
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes

# macos 14 is M1 (beta)
# macos 14 is M1
build_macos_14:
runs-on: macos-14
steps:
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:

build_windows:
runs-on: windows-latest
needs: [build_macos_12, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
steps:
- uses: actions/checkout@v4
- name: Build HiGHS Windows native
Expand Down
34 changes: 1 addition & 33 deletions .github/workflows/build-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,38 +105,6 @@ jobs:
python3 -m pip install pytest
python3 -m pytest $GITHUB_WORKSPACE
# macos 12 is Intel
build_wheel_macos_12:
runs-on: macos-latest
strategy:
matrix:
python: [3.11]
steps:
- uses: actions/checkout@v4

- name: Install correct python version
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

- name: Build wheel
run: |
python3 -m pip install cibuildwheel
python3 -m cibuildwheel --only cp311-macosx_x86_64 $GITHUB_WORKSPACE
- name: Install wheel
run: |
ls wheelhouse
python3 --version
python3 -m pip install wheelhouse/*.whl
python3 -c "import highspy; print(dir(highspy))"
- name: Test highspy
run: |
python3 -m pip install pytest
python3 -m pytest $GITHUB_WORKSPACE
# macos 13 is Intel
build_wheel_macos_13:
runs-on: macos-13
Expand Down Expand Up @@ -168,7 +136,7 @@ jobs:
python3 -m pip install pytest
python3 -m pytest $GITHUB_WORKSPACE
# macos 14 is M1 (beta)
# macos 14 is M1
build_wheel_macos_14:
runs-on: macos-14
strategy:
Expand Down

0 comments on commit cec527d

Please sign in to comment.