From cec527da169c9f57cb42f41bf0b0ddc8c51ff668 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 29 Oct 2024 13:45:34 +0200 Subject: [PATCH] remove more references to macos-12 --- .github/workflows/build-nuget-package.yml | 10 +++---- .github/workflows/build-python-package.yml | 34 +--------------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml index bbd55ad4f6..ab9bb2d3af 100644 --- a/.github/workflows/build-nuget-package.yml +++ b/.github/workflows/build-nuget-package.yml @@ -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] @@ -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: @@ -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 diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml index 0cb1f6f500..7e25f1f36f 100644 --- a/.github/workflows/build-python-package.yml +++ b/.github/workflows/build-python-package.yml @@ -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 @@ -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: