Skip to content

Commit 49b3809

Browse files
committed
update ci
1 parent 1eefb31 commit 49b3809

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

.github/workflows/fortran.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ jobs:
3636
- name: Setup Fortran
3737
id: setup-fortran
3838
uses: fortran-lang/setup-fortran@v1
39+
with:
40+
compiler: gcc
41+
version: 13
3942

4043
# CMake + Ninja (uniform across OSes)
4144
- name: Setup CMake & Ninja

.github/workflows/make-mex.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,19 @@ jobs:
4444
sed -i '/ LIBSFFT/a \ \ LIBSFFT := `g++ --print-file-name libfftw3.a` `g++ --print-file-name libfftw3f.a` `g++ --print-file-name libfftw3_omp.a` `g++ --print-file-name libfftw3f_omp.a` `g++ --print-file-name libm.a` `g++ --print-file-name libgomp.a`' makefile
4545
/c/msys64/usr/bin/make matlab
4646
shell: C:\msys64\usr\bin\bash.exe {0}
47+
- name: Select Xcode 16.0
48+
if: runner.os == 'macOS'
49+
uses: maxim-lobanov/setup-xcode@v1
50+
with:
51+
xcode-version: '16.0'
4752
- name: Generate macOS mex file
4853
if: runner.os == 'macOS'
4954
run: |
55+
xcodebuild -version
5056
brew install fftw libomp
5157
sed 's/\/Applications\/MATLAB_R20\*\*.app/\/Users\/runner\/hostedtoolcache\/MATLAB\/2023.2.999\/arm64\/MATLAB.app/' make-platforms/make.inc.macosx_arm64 > make.inc
5258
sed -i -e 's/-lomp//' make.inc
53-
sed -i -e 's/ LIBSFFT.*/\ \ LIBSFFT := \/opt\/homebrew\/opt\/fftw\/lib\/libfftw3\.a \/opt\/homebrew\/opt\/fftw\/lib\/libfftw3f\.a \/opt\/homebrew\/opt\/fftw\/lib\/libfftw3_omp.a \/opt\/homebrew\/opt\/fftw\/lib\/libfftw3f_omp\.a -L\/opt\/homebrew\/opt\/libomp\/lib -lomp/' makefile
59+
sed -i -e 's/ LIBSFFT.*/\ \ LIBSFFT := \/opt\/homebrew\/opt\/fftw\/lib\/libfftw3\.a \/opt\/homebrew\/opt\/fftw\/lib\/libfftw3f\.a \/opt\/homebrew\/opt\/fftw\/lib\/libfftw3_omp.a \/opt\/homebrew\/opt\/fftw\/lib\/libfftw3f_omp\.a -L\/Users\/runner\/hostedtoolcache\/MATLAB\/2023.2.999\/arm64\/MATLAB.app\/bin\/maca64 -lomp/' makefile
5460
make matlab
5561
- name: Generate Linux mex file
5662
if: runner.os == 'Linux'

.github/workflows/mex.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,16 @@ jobs:
4040
cmake: true
4141
ninja: true
4242
vcvarsall: true
43+
- name: Select Xcode 16.0 (macOS 15 only)
44+
if: ${{ runner.os == 'macOS' && matrix.os == 'macos-15' }}
45+
uses: maxim-lobanov/setup-xcode@v1
46+
with:
47+
xcode-version: '16.0'
4348
- name: Set macOS deployment target
4449
if: runner.os == 'macOS'
4550
shell: bash
4651
run: |
52+
xcodebuild -version
4753
brew install fftw libomp
4854
echo "LDFLAGS=-L$(brew --prefix libomp)/lib" >> $GITHUB_ENV
4955
echo "CPPFLAGS=-I$(brew --prefix libomp)/include" >> $GITHUB_ENV

0 commit comments

Comments
 (0)