Skip to content

Commit daa3e05

Browse files
committed
cpack on on mac, next see windows.
1 parent adf1065 commit daa3e05

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

.github/julia/build_tarballs_release.jl

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ version = VersionNumber(ENV["HIGHS_RELEASE"])
1212
sources = [GitSource(ENV["HIGHS_URL"], ENV["HIGHS_COMMIT"])
1313
# ArchiveSource("https://github.com/xianyi/OpenBLAS/releases/download/v0.3.21/OpenBLAS-0.3.21.tar.gz",
1414
# "f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca")
15-
ArchiveSource(
16-
"https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.30/OpenBLAS-0.3.30.tar.gz",
17-
"27342cff518646afb4c2b976d809102e368957974c250a25ccc965e53063c95d")
15+
ArchiveSource("https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.30/OpenBLAS-0.3.30.tar.gz",
16+
"27342cff518646afb4c2b976d809102e368957974c250a25ccc965e53063c95d")
1817
]
1918

2019
script = raw"""
@@ -45,29 +44,33 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
4544
else
4645
cd $WORKSPACE/srcdir/OpenBLAS*
4746
48-
if [[ "${target}" == x86_64-* ]]; then
49-
export TARGET=HASWELL
50-
export BINARY=64
51-
elif [[ "${target}" == i686-* ]]; then
52-
export TARGET=PRESCOTT
53-
export BINARY=32
54-
elif [[ "${target}" == aarch64-* ]]; then
55-
export TARGET=ARMV8
56-
export BINARY=64
57-
elif [[ "${target}" == arm-* ]]; then
58-
export TARGET=ARMV7
59-
export BINARY=32
60-
elif [[ "${target}" == powerpc64le-* ]]; then
61-
export TARGET=POWER8
62-
export BINARY=64
63-
fi
64-
65-
make DYNAMIC_ARCH=1 NO_SHARED=1 USE_OPENMP=0 NUM_THREADS=64 \
66-
TARGET=${TARGET} BINARY=${BINARY} NO_LAPACK=0 \
67-
CC=${CC} FC=${FC} HOSTCC=gcc -j${nproc}
68-
69-
make DYNAMIC_ARCH=1 NO_SHARED=1 USE_OPENMP=0 NUM_THREADS=64 BINARY=64 -j${nproc}
70-
make install PREFIX=${prefix} NO_SHARED=1
47+
case "$target" in
48+
x86_64-linux*)
49+
OPENBLAS_TARGET="HASWELL"
50+
;;
51+
x86_64-w64-mingw*)
52+
OPENBLAS_TARGET="CORE2"
53+
;;
54+
aarch64-*)
55+
OPENBLAS_TARGET="ARMV8"
56+
;;
57+
*)
58+
OPENBLAS_TARGET="CORE2"
59+
;;
60+
esac
61+
62+
make -j${nproc} NO_SHARED=1 USE_OPENMP=0 \
63+
TARGET=${OPENBLAS_TARGET} \
64+
BUILD_TARGET=${OPENBLAS_TARGET} \
65+
BINARY=64 \
66+
CROSS=1 \
67+
NO_LAPACK=0 \
68+
CC="${CC}" \
69+
FC="${FC}" \
70+
HOSTCC="${HOSTCC}" \
71+
libs
72+
73+
make install PREFIX=${prefix}
7174
7275
cd $WORKSPACE/srcdir/HiGHS
7376
apk del cmake

.github/workflows/release-cpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ jobs:
109109
uses: actions/upload-artifact@v4
110110
with:
111111
name: macos-universal
112-
path: build/*.dmg
112+
path: build/*.tar.gz

0 commit comments

Comments
 (0)