Skip to content

Commit c2c4bb0

Browse files
authored
Merge pull request ERGO-Code#1821 from ERGO-Code/master
update latest
2 parents d630089 + aadf029 commit c2c4bb0

File tree

3 files changed

+31
-3
lines changed

3 files changed

+31
-3
lines changed

.github/workflows/build-wheels-push.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ jobs:
2626
buildplat:
2727
- [ubuntu-20.04, manylinux_x86_64]
2828
- [ubuntu-20.04, manylinux_i686]
29+
- [ubuntu-20.04, manylinux_aarch64]
2930
- [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
3031
- [ubuntu-20.04, musllinux_i686]
32+
- [ubuntu-20.04, musllinux_aarch64]
3133
- [macos-12, macosx_x86_64]
3234
- [macos-14, macosx_arm64]
3335
- [windows-2019, win_amd64]
@@ -36,7 +38,19 @@ jobs:
3638

3739
steps:
3840
- uses: actions/checkout@v4
39-
- name: Build wheels
41+
- name: Set up QEMU # Required for aarch64 builds
42+
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
43+
uses: docker/setup-qemu-action@v3
44+
with:
45+
platforms: all
46+
- name: Build wheels (aarch64)
47+
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
48+
uses: pypa/[email protected]
49+
env:
50+
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
51+
CIBW_ARCHS_LINUX: aarch64
52+
- name: Build wheels (not aarch64)
53+
if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
4054
uses: pypa/[email protected]
4155
env:
4256
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

.github/workflows/build-wheels.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ jobs:
2121
buildplat:
2222
- [ubuntu-20.04, manylinux_x86_64]
2323
- [ubuntu-20.04, manylinux_i686]
24+
- [ubuntu-20.04, manylinux_aarch64]
2425
- [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
2526
- [ubuntu-20.04, musllinux_i686]
27+
- [ubuntu-20.04, musllinux_aarch64]
2628
- [macos-12, macosx_x86_64]
2729
- [macos-14, macosx_arm64]
2830
- [windows-2019, win_amd64]
@@ -31,7 +33,19 @@ jobs:
3133

3234
steps:
3335
- uses: actions/checkout@v4
34-
- name: Build wheels
36+
- name: Set up QEMU # Required for aarch64 builds
37+
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
38+
uses: docker/setup-qemu-action@v3
39+
with:
40+
platforms: all
41+
- name: Build wheels (aarch64)
42+
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
43+
uses: pypa/[email protected]
44+
env:
45+
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
46+
CIBW_ARCHS_LINUX: aarch64
47+
- name: Build wheels (not aarch64)
48+
if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
3549
uses: pypa/[email protected]
3650
env:
3751
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ if (BUILD_CXX)
189189
set(ipo_supported NO)
190190
message(STATUS "IPO / LTO not currently supported building HiGHS on MinGW")
191191
else()
192-
if(CMAKE_VERSION VERSION_GREATER "3.23.0")
192+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
193193
cmake_policy(SET CMP0138 NEW)
194194
endif()
195195

0 commit comments

Comments
 (0)