Skip to content

Commit 2ba3247

Browse files
jajhalljajhall
authored
Merge branch 'latest' into fix-2239
2 parents 385bd33 + 74481e7 commit 2ba3247

File tree

325 files changed

+31113
-9888
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+31113
-9888
lines changed

‎.bazelrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
common --noenable_bzlmod

‎.github/workflows/build-bazel.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
run: bazel clean
1919

2020
- name: build bazel
21-
run: bazel build --enable_bzlmod //...
21+
run: bazel build //...
2222

2323
- name: test all
24-
run: bazel test --enable_bzlmod //...
24+
run: bazel test //...
2525

2626
- name: test example
2727
run: ./bazel-bin/call-highs-example

‎.github/workflows/build-nuget-package.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,47 +80,49 @@ jobs:
8080

8181
build_linux:
8282
runs-on: ubuntu-latest
83+
container: stabletec/build-core:debian-11
8384
steps:
8485
- uses: actions/checkout@v4
8586
- name: Build HiGHS
8687
run: |
87-
cmake -E make_directory ${{runner.workspace}}/build
88+
cmake -E make_directory /__w/HiGHS/HiGHS/build
8889
8990
- name: Configure CMake
90-
working-directory: ${{runner.workspace}}/build
91+
working-directory: /__w/HiGHS/HiGHS/build
9192
run: cmake $GITHUB_WORKSPACE -DCSHARP=ON -DBUILD_DOTNET=ON
9293

9394
- name: Build
94-
working-directory: ${{runner.workspace}}/build
95+
working-directory: /__w/HiGHS/HiGHS/build
9596
run: cmake --build . --config Release --parallel
9697

9798
- uses: actions/upload-artifact@v4
9899
with:
99100
name: linux-x64
100-
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
101+
path: /__w/HiGHS/HiGHS/build/dotnet/Highs.Native/runtimes
101102

102103
build_linux_arm64:
103-
runs-on: ubuntu-latest
104+
runs-on: ubuntu-24.04-arm
105+
container: stabletec/build-core:debian-11
104106
steps:
105107
- uses: actions/checkout@v4
106108
- name: Build HiGHS
107109
run: |
108-
cmake -E make_directory ${{runner.workspace}}/build_linux_arm64
110+
cmake -E make_directory /__w/HiGHS/HiGHS/build_linux_arm64
109111
110112
- name: Configure CMake linux-arm-64
111-
working-directory: ${{runner.workspace}}/build_linux_arm64
113+
working-directory: /__w/HiGHS/HiGHS/build_linux_arm64
112114
shell: bash
113115
run: cmake $GITHUB_WORKSPACE -DCSHARP=ON -DBUILD_DOTNET=ON -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/nuget/arm-toolchain.cmake
114116

115117
- name: Build linux-arm-64
116-
working-directory: ${{runner.workspace}}/build_linux_arm64
118+
working-directory: /__w/HiGHS/HiGHS/build_linux_arm64
117119
shell: bash
118120
run: cmake --build . --config Release --parallel
119121

120122
- uses: actions/upload-artifact@v4
121123
with:
122124
name: linux-arm64
123-
path: ${{runner.workspace}}/build_linux_arm64/dotnet/Highs.Native/runtimes
125+
path: /__w/HiGHS/HiGHS/build_linux_arm64/dotnet/Highs.Native/runtimes
124126

125127
build_windows:
126128
runs-on: windows-latest

‎.github/workflows/build-python-package.yml‎

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,23 @@ jobs:
7575
python -m pytest
7676
7777
build_wheel_linux:
78-
# ubuntu 22 has a latest version of cmake, but setup-python
79-
# does not seem to provide all necessary modules to find python
80-
# from cmake. works on my machine, test the wheels manually
81-
runs-on: ubuntu-latest
78+
runs-on: ubuntu-24.04
79+
strategy:
80+
matrix:
81+
python: [3.11]
8282
steps:
8383
- uses: actions/checkout@v4
84-
# strategy:
85-
# matrix:
86-
# python: [3.12]
8784

8885
- name: Install correct python version
8986
uses: actions/setup-python@v5
90-
# with:
91-
# python-version: ${{ matrix.python }}
87+
with:
88+
python-version: ${{ matrix.python }}
9289

9390
- name: Build wheel
9491
run: |
9592
python3 --version
9693
python3 -m pip install cibuildwheel
97-
python3 -m cibuildwheel --only cp310-manylinux_x86_64 $GITHUB_WORKSPACE
94+
python3 -m cibuildwheel --only cp311-manylinux_x86_64 $GITHUB_WORKSPACE
9895
9996
- name: Install wheel
10097
run: |
@@ -105,7 +102,36 @@ jobs:
105102
run: |
106103
python3 -m pip install pytest
107104
python3 -m pytest $GITHUB_WORKSPACE
108-
105+
106+
build_wheel_linux_arm:
107+
runs-on: ubuntu-24.04-arm
108+
strategy:
109+
matrix:
110+
python: [3.11]
111+
steps:
112+
- uses: actions/checkout@v4
113+
114+
- name: Install python
115+
uses: actions/setup-python@v5
116+
with:
117+
python-version: ${{ matrix.python }}
118+
119+
- name: Build wheel
120+
run: |
121+
python3 --version
122+
python3 -m pip install cibuildwheel
123+
python3 -m cibuildwheel --only cp311-manylinux_aarch64 $GITHUB_WORKSPACE
124+
125+
- name: Install wheel
126+
run: |
127+
ls wheelhouse
128+
python3 -m pip install wheelhouse/*.whl
129+
130+
- name: Test highspy
131+
run: |
132+
python3 -m pip install pytest
133+
python3 -m pytest $GITHUB_WORKSPACE
134+
109135
# macos 13 is Intel
110136
build_wheel_macos_13:
111137
runs-on: macos-13

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

Lines changed: 46 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: build-wheels-push
22

3-
on: []
3+
# on: []
44
# on: push
55

6-
# on:
7-
# release:
8-
# types:
9-
# - published
6+
on:
7+
release:
8+
types:
9+
- published
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
@@ -43,12 +43,12 @@ jobs:
4343
# Github Actions doesn't support pairing matrix values together, let's improvise
4444
# https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
4545
buildplat:
46-
- [ubuntu-20.04, manylinux_x86_64]
47-
- [ubuntu-20.04, manylinux_i686]
48-
- [ubuntu-20.04, manylinux_aarch64]
49-
- [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
50-
- [ubuntu-20.04, musllinux_i686]
51-
- [ubuntu-20.04, musllinux_aarch64]
46+
- [ubuntu-24.04, manylinux_x86_64]
47+
- [ubuntu-24.04, manylinux_i686]
48+
- [ubuntu-24.04-arm, manylinux_aarch64]
49+
- [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
50+
- [ubuntu-24.04, musllinux_i686]
51+
- [ubuntu-24.04-arm, musllinux_aarch64]
5252
- [macos-13, macosx_x86_64]
5353
- [macos-14, macosx_arm64]
5454
- [windows-2019, win_amd64]
@@ -58,21 +58,7 @@ jobs:
5858
steps:
5959
- uses: actions/checkout@v4
6060

61-
- name: Set up QEMU # Required for aarch64 builds
62-
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
63-
uses: docker/setup-qemu-action@v3
64-
with:
65-
platforms: all
66-
67-
- name: Build wheels (aarch64)
68-
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
69-
uses: pypa/[email protected]
70-
env:
71-
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
72-
CIBW_ARCHS_LINUX: aarch64
73-
74-
- name: Build wheels (not aarch64)
75-
if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
61+
- name: Build wheels
7662
uses: pypa/[email protected]
7763
env:
7864
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
@@ -82,51 +68,22 @@ jobs:
8268
name: cibw-wheels-${{ matrix.python }}-${{ matrix.buildplat[1] }}
8369
path: wheelhouse/*.whl
8470

85-
upload_testpypi:
86-
name: >-
87-
Publish highspy to TestPyPI
88-
runs-on: ubuntu-latest
89-
needs: [build_wheels, build_sdist]
90-
# needs: [build_sdist]
91-
92-
# upload to PyPI on every tag starting with 'v'
93-
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
94-
95-
environment:
96-
name: testpypi
97-
url: https://test.pypi.org/p/highspy
98-
99-
permissions:
100-
id-token: write # IMPORTANT: mandatory for trusted publishing
101-
steps:
102-
- uses: actions/download-artifact@v4
103-
with:
104-
pattern: cibw-*
105-
path: dist
106-
merge-multiple: true
107-
108-
- name: Download all
109-
uses: pypa/gh-action-pypi-publish@release/v1
110-
with:
111-
repository-url: https://test.pypi.org/legacy/
112-
verbose: true
113-
114-
# upload_pypi:
71+
# upload_testpypi:
11572
# name: >-
116-
# Publish highspy to PyPI
73+
# Publish highspy to TestPyPI
11774
# runs-on: ubuntu-latest
11875
# needs: [build_wheels, build_sdist]
76+
# # needs: [build_sdist]
11977

12078
# # upload to PyPI on every tag starting with 'v'
12179
# # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
12280

12381
# environment:
124-
# name: pypi
125-
# url: https://pypi.org/p/highspy
82+
# name: testpypi
83+
# url: https://test.pypi.org/p/highspy
12684

12785
# permissions:
12886
# id-token: write # IMPORTANT: mandatory for trusted publishing
129-
13087
# steps:
13188
# - uses: actions/download-artifact@v4
13289
# with:
@@ -136,3 +93,32 @@ jobs:
13693

13794
# - name: Download all
13895
# uses: pypa/gh-action-pypi-publish@release/v1
96+
# with:
97+
# repository-url: https://test.pypi.org/legacy/
98+
# verbose: true
99+
100+
upload_pypi:
101+
name: >-
102+
Publish highspy to PyPI
103+
runs-on: ubuntu-latest
104+
needs: [build_wheels, build_sdist]
105+
106+
# upload to PyPI on every tag starting with 'v'
107+
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
108+
109+
environment:
110+
name: pypi
111+
url: https://pypi.org/p/highspy
112+
113+
permissions:
114+
id-token: write # IMPORTANT: mandatory for trusted publishing
115+
116+
steps:
117+
- uses: actions/download-artifact@v4
118+
with:
119+
pattern: cibw-*
120+
path: dist
121+
merge-multiple: true
122+
123+
- name: Download all
124+
uses: pypa/gh-action-pypi-publish@release/v1

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

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
# Github Actions doesn't support pairing matrix values together, let's improvise
3333
# https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
3434
buildplat:
35-
- [ubuntu-20.04, manylinux_x86_64]
36-
- [ubuntu-20.04, manylinux_i686]
37-
- [ubuntu-20.04, manylinux_aarch64]
38-
- [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
39-
- [ubuntu-20.04, musllinux_i686]
40-
- [ubuntu-20.04, musllinux_aarch64]
35+
- [ubuntu-24.04, manylinux_x86_64]
36+
- [ubuntu-24.04, manylinux_i686]
37+
- [ubuntu-24.04-arm, manylinux_aarch64]
38+
- [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
39+
- [ubuntu-24.04, musllinux_i686]
40+
- [ubuntu-24.04-arm, musllinux_aarch64]
4141
- [macos-13, macosx_x86_64]
4242
- [macos-14, macosx_arm64]
4343
- [windows-2019, win_amd64]
@@ -46,21 +46,7 @@ jobs:
4646

4747
steps:
4848
- uses: actions/checkout@v4
49-
- name: Set up QEMU # Required for aarch64 builds
50-
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
51-
uses: docker/setup-qemu-action@v3
52-
with:
53-
platforms: all
54-
55-
- name: Build wheels (aarch64)
56-
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
57-
uses: pypa/[email protected]
58-
env:
59-
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
60-
CIBW_ARCHS_LINUX: aarch64
61-
62-
- name: Build wheels (not aarch64)
63-
if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
49+
- name: Build wheels
6450
uses: pypa/[email protected]
6551
env:
6652
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

0 commit comments

Comments
 (0)