Skip to content

Commit 4efdcea

Browse files
committed
merge latest
2 parents 3e06b50 + 9fa8db6 commit 4efdcea

Some content is hidden

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

80 files changed

+4241
-2534
lines changed

.github/julia/build_tarballs.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
3333
-DCMAKE_BUILD_TYPE=Release \
3434
-DBUILD_SHARED_LIBS=${BUILD_SHARED} \
3535
-DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
36-
-DFAST_BUILD=ON ..
36+
-DHIPO=ON \
37+
-DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}" \
38+
-DMETIS_ROOT=${prefix} \
39+
..
3740
3841
if [[ "${target}" == *-linux-* ]]; then
3942
make -j ${nproc}
@@ -60,6 +63,8 @@ platforms = expand_cxxstring_abis(platforms)
6063
dependencies = [
6164
Dependency("CompilerSupportLibraries_jll"),
6265
Dependency("Zlib_jll"),
66+
Dependency("METIS_jll"),
67+
Dependency("OpenBLAS32_jll"),
6368
HostBuildDependency(PackageSpec(; name="CMake_jll")),
6469
]
6570

.github/workflows/build-intel.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: build-intel
22

33
on: [push, pull_request]
4-
# on: []
54

65
jobs:
76
build:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
name: macos-x64
3030
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
31-
31+
3232
# Build macos arm64
3333
build_macos_arm:
3434
runs-on: macos-14 # macos-14 is arm64
@@ -51,14 +51,14 @@ jobs:
5151
name: macos-arm64
5252
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
5353

54-
# Build windows 32 and linux
54+
# Build windows 32 and linux
5555
build_windows_32:
5656
runs-on: windows-latest
5757
steps:
5858
- uses: actions/checkout@v4
5959
- name: Build HiGHS
6060
run: |
61-
cmake -E make_directory ${{runner.workspace}}/build32
61+
cmake -E make_directory ${{runner.workspace}}/build32
6262
6363
- name: Configure CMake win32
6464
shell: bash
@@ -139,10 +139,10 @@ jobs:
139139
working-directory: ${{runner.workspace}}/build
140140
shell: bash
141141
run: cmake --build . --config Release --parallel
142-
142+
143143
- name: Display structure of downloaded files
144144
run: |
145-
pwd
145+
pwd
146146
ls -R ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
147147
148148
- name: Download runtimes macos-x64
@@ -184,7 +184,7 @@ jobs:
184184

185185
- name: Dotnet pack
186186
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
187-
run: dotnet pack -c Release /p:Version=1.11.0
187+
run: dotnet pack -c Release /p:Version=1.12.0
188188

189189
- uses: actions/upload-artifact@v4
190190
with:
@@ -198,7 +198,7 @@ jobs:
198198
name: nuget
199199

200200
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
201-
steps:
201+
steps:
202202
- uses: actions/checkout@v4
203203
- uses: actions/setup-dotnet@v4
204204

@@ -208,6 +208,6 @@ jobs:
208208
name: nuget
209209

210210
- name: Dotnet push
211-
run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
211+
run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
212212
# env:
213213
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)