Skip to content

Commit 4cf40ae

Browse files
committed
Update
1 parent 92894f8 commit 4cf40ae

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

.github/julia/build_tarballs.jl

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,21 @@ apk del cmake
2020
rm -rf build
2121
mkdir build
2222
23+
if [[ "${target}" == *-mingw* ]]; then
24+
LBT=blastrampoline-5
25+
else
26+
LBT=blastrampoline
27+
fi
28+
2329
cmake -S . -B build \
2430
-DCMAKE_INSTALL_PREFIX=${prefix} \
2531
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \
2632
-DCMAKE_BUILD_TYPE=Release \
2733
-DBUILD_SHARED_LIBS=ON \
2834
-DHIPO=ON \
29-
-DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}"
35+
-DBUILD_SHARED_EXTRAS_LIB=OFF \
36+
-DBLA_VENDOR=blastrampoline \
37+
-DBLAS_LIBRARIES=\"${LBT}\"
3038
3139
if [[ "${target}" == *-linux-* ]]; then
3240
make -C build -j ${nproc}
@@ -53,7 +61,7 @@ platforms = expand_cxxstring_abis(platforms)
5361
dependencies = [
5462
Dependency("CompilerSupportLibraries_jll"),
5563
Dependency("Zlib_jll"),
56-
Dependency("OpenBLAS32_jll"),
64+
Dependency("libblastrampoline_jll"),
5765
HostBuildDependency(PackageSpec(; name="CMake_jll")),
5866
]
5967

.github/workflows/julia-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ jobs:
106106
"$(m[1]) = \"$(dir)\"\n",
107107
)
108108
Pkg.develop(; path = joinpath(ENV["GITHUB_WORKSPACE"], "HiGHS_jll"))
109-
- shell: julia --color=yes {0}
110-
run: |
111-
import HiGHS_jll
112-
file = joinpath(ENV["GITHUB_WORKSPACE"], "check", "instances", "flugpl.mps")
113-
run(`$(HiGHS_jll.highs()) --solver=hipo $file`)
114-
run(`$(HiGHS_jll.highs()) $file`)
109+
# - shell: julia --color=yes {0}
110+
# run: |
111+
# import HiGHS_jll
112+
# file = joinpath(ENV["GITHUB_WORKSPACE"], "check", "instances", "flugpl.mps")
113+
# run(`$(HiGHS_jll.highs()) --solver=hipo $file`)
114+
# run(`$(HiGHS_jll.highs()) $file`)
115115
- shell: julia --color=yes {0}
116116
run: |
117117
using Pkg

0 commit comments

Comments
 (0)