CI: adapt for new macOS runner
- enforce x86-64 architecture - use “sysctl -n hw.ncpu” instead of “nproc” (which has not been installed in the new runner) - use MATLAB R2022b for building with the latest ABIsilicon
parent
7583790851
commit
7159a293d6
|
@ -90,7 +90,7 @@ pkg_macOS:
|
||||||
stage: pkg
|
stage: pkg
|
||||||
script:
|
script:
|
||||||
- ln -s ~/tarballs macOS/deps/
|
- ln -s ~/tarballs macOS/deps/
|
||||||
- make -C macOS
|
- arch -x86_64 make -C macOS
|
||||||
cache:
|
cache:
|
||||||
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
|
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
|
||||||
paths:
|
paths:
|
||||||
|
|
|
@ -29,7 +29,7 @@ CC=gcc-$GCC_VERSION
|
||||||
CXX=g++-$GCC_VERSION
|
CXX=g++-$GCC_VERSION
|
||||||
|
|
||||||
# Set the number of threads
|
# Set the number of threads
|
||||||
NTHREADS=$(nproc)
|
NTHREADS=$(sysctl -n hw.ncpu)
|
||||||
|
|
||||||
# Set dependency directory
|
# Set dependency directory
|
||||||
LIB64="$ROOTDIR"/macOS/deps/lib64
|
LIB64="$ROOTDIR"/macOS/deps/lib64
|
||||||
|
@ -168,7 +168,7 @@ make clean
|
||||||
--with-gsl="$LIB64"/gsl \
|
--with-gsl="$LIB64"/gsl \
|
||||||
--with-matio="$LIB64"/matio \
|
--with-matio="$LIB64"/matio \
|
||||||
--with-slicot="$LIB64"/Slicot/with-underscore \
|
--with-slicot="$LIB64"/Slicot/with-underscore \
|
||||||
--with-matlab=/Applications/MATLAB_R2019b.app
|
--with-matlab=/Applications/MATLAB_R2022b.app
|
||||||
make -j"$NTHREADS"
|
make -j"$NTHREADS"
|
||||||
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.13
|
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.13
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 715ec9e4bc681bf2e1d5236d0dc4098212ddf9e6
|
Subproject commit df7144525d47489493590b062ee8cde9b9b5170e
|
Loading…
Reference in New Issue