Skip to content

Commit

Permalink
merge latest
Browse files Browse the repository at this point in the history
  • Loading branch information
galabovaa committed Jun 10, 2024
2 parents 21fcee7 + ec2399e commit f9b5e7e
Show file tree
Hide file tree
Showing 79 changed files with 6,188 additions and 1,190 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
python3 -m pytest $GITHUB_WORKSPACE
build_sdist_win:
runs-on: windows-latest
runs-on: windows-2019
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-wheels-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Build wheels
uses: pypa/cibuildwheel@v2.17
uses: pypa/cibuildwheel@v2.18.1
env:
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
- uses: actions/upload-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.buildplat[0] }}
strategy:
# Ensure that a wheel builder finishes even if another fails
fail-fast: false
fail-fast: true
matrix:
# From NumPy
# Github Actions doesn't support pairing matrix values together, let's improvise
Expand All @@ -31,7 +31,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Build wheels
uses: pypa/cibuildwheel@v2.17
uses: pypa/cibuildwheel@v2.18.1
env:
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
fast_build_release:
runs-on: windows-latest
runs-on: windows-2019

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
run: cmake $GITHUB_WORKSPACE -DALL_TESTS=ON

fast_build_release_all_tests:
runs-on: windows-latest
runs-on: windows-2019

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
run: cmake --install .

windows_release_fb_off:
runs-on: windows-latest
runs-on: windows-2019

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
run: ctest --parallel --timeout 300 --output-on-failure -C Debug

windows_release64:
runs-on: windows-latest
runs-on: windows-2019

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
run: ctest --timeout 300 --output-on-failure -C Release

windows_release64_all_tests:
runs-on: windows-latest
runs-on: windows-2019

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:


windows_release64_fb_off:
runs-on: windows-latest
runs-on: windows-2019

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -413,4 +413,4 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --output-on-failure -C Debug
run: ctest --output-on-failure -C Debug
2 changes: 1 addition & 1 deletion .github/workflows/test-csharp-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
fast_build_release:
runs-on: windows-latest
runs-on: windows-2019

steps:
- uses: actions/checkout@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: ./bin/highs $GITHUB_WORKSPACE/check/instances/25fv47.mps

test_win:
runs-on: [windows-latest]
runs-on: [windows-2019]

steps:
- uses: actions/checkout@v4
Expand Down
232 changes: 232 additions & 0 deletions .github/workflows/test-nuget-package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
name: test-nuget-package

on: [push, pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
# macos 12 is Intel
build_macos_12:
runs-on: macos-12
# strategy:
# matrix:
# python: [3.11]
steps:
- uses: actions/checkout@v4
- name: Build HiGHS
run: |
cmake -E make_directory ${{runner.workspace}}/build
cmake -E make_directory ${{runner.workspace}}/nugets
cmake -E make_directory ${{runner.workspace}}/test_nuget
- name: Configure CMake
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCSHARP=ON -DBUILD_DOTNET=ON

- name: Build
working-directory: ${{runner.workspace}}/build
run: cmake --build . --config Release --parallel

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

- name: Dotnet pack
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet pack -c Release /p:Version=1.7.0

- name: Add local feed
run: dotnet nuget add source ${{runner.workspace}}/nugets

- name: Dotnet push to local feed
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet nuget push ./bin/Release/*.nupkg -s ${{runner.workspace}}/nugets

- name: Create new project and test
shell: bash
working-directory: ${{runner.workspace}}/test_nuget
run: |
dotnet new console
rm Program.cs
cp $GITHUB_WORKSPACE/examples/call_highs_from_csharp.cs .
dotnet add package Highs.Native -s ${{runner.workspace}}/nugets
dotnet run
# macos 14 is M1 (beta)
build_macos_14:
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- name: Build HiGHS
run: |
cmake -E make_directory ${{runner.workspace}}/build
cmake -E make_directory ${{runner.workspace}}/nugets
cmake -E make_directory ${{runner.workspace}}/test_nuget
- name: Configure CMake
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCSHARP=ON -DBUILD_DOTNET=ON

- name: Build
working-directory: ${{runner.workspace}}/build
run: cmake --build . --config Release --parallel

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

- name: Dotnet pack
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet pack -c Release /p:Version=1.7.0

- name: Add local feed
run: dotnet nuget add source ${{runner.workspace}}/nugets

- name: Dotnet push to local feed
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet nuget push ./bin/Release/*.nupkg -s ${{runner.workspace}}/nugets

- name: Create new project and test
shell: bash
working-directory: ${{runner.workspace}}/test_nuget
run: |
dotnet new console
rm Program.cs
cp $GITHUB_WORKSPACE/examples/call_highs_from_csharp.cs .
dotnet add package Highs.Native -s ${{runner.workspace}}/nugets
dotnet run
build_linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build HiGHS
run: |
cmake -E make_directory ${{runner.workspace}}/build
cmake -E make_directory ${{runner.workspace}}/nugets
cmake -E make_directory ${{runner.workspace}}/test_nuget
- name: Configure CMake
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCSHARP=ON -DBUILD_DOTNET=ON

- name: Build
working-directory: ${{runner.workspace}}/build
run: cmake --build . --config Release --parallel

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

- name: Dotnet pack
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet pack -c Release /p:Version=1.7.0

- name: Add local feed
run: dotnet nuget add source ${{runner.workspace}}/nugets

- name: Dotnet push to local feed
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet nuget push ./bin/Release/*.nupkg -s ${{runner.workspace}}/nugets

- name: Create new project and test
shell: bash
working-directory: ${{runner.workspace}}/test_nuget
run: |
dotnet new console
rm Program.cs
cp $GITHUB_WORKSPACE/examples/call_highs_from_csharp.cs .
dotnet add package Highs.Native -s ${{runner.workspace}}/nugets
dotnet run
build_linux_8:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build HiGHS
run: |
cmake -E make_directory ${{runner.workspace}}/build
cmake -E make_directory ${{runner.workspace}}/nugets
cmake -E make_directory ${{runner.workspace}}/test_nuget
- name: Configure CMake
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCSHARP=ON -DBUILD_DOTNET=ON

- name: Build
working-directory: ${{runner.workspace}}/build
run: cmake --build . --config Release --parallel

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'

- name: Dotnet pack
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet pack -c Release /p:Version=1.7.0

- name: Add local feed
run: dotnet nuget add source ${{runner.workspace}}/nugets

- name: Dotnet push to local feed
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet nuget push ./bin/Release/*.nupkg -s ${{runner.workspace}}/nugets

- name: Create new project and test
shell: bash
working-directory: ${{runner.workspace}}/test_nuget
run: |
dotnet new console
rm Program.cs
cp $GITHUB_WORKSPACE/examples/call_highs_from_csharp.cs .
dotnet add package Highs.Native -s ${{runner.workspace}}/nugets
dotnet run
build_windows:
runs-on: windows-2019
steps:
- uses: actions/checkout@v4
- name: Build HiGHS Windows native
run: |
cmake -E make_directory ${{runner.workspace}}/build
cmake -E make_directory ${{runner.workspace}}/nugets
cmake -E make_directory ${{runner.workspace}}/test_nuget
- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DCSHARP=ON -DBUILD_DOTNET=ON

- name: Build
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake --build . --config Release --parallel

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

- name: Dotnet pack
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet pack -c Release /p:Version=1.7.0

- name: Add local feed
run: dotnet nuget add source -n name ${{runner.workspace}}\nugets

- name: Dotnet push to local feed
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
shell: bash
run: dotnet nuget push ./bin/Release/*.nupkg -s name

- name: Create new project and test
working-directory: ${{runner.workspace}}/test_nuget
run: |
dotnet new console
rm Program.cs
cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs .
dotnet add package Highs.Native -v 1.7.0 -s ${{runner.workspace}}\nugets
dotnet run
Loading

0 comments on commit f9b5e7e

Please sign in to comment.