@@ -58,19 +58,19 @@ jobs:
58
58
59
59
# Build ADMB for macos-13
60
60
- name : Build ADMB for macos-13 and put in path
61
- if : matrix.config.os == 'macos-13'
61
+ if : matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
62
62
run : |
63
63
cd admb && make clean
64
64
- name : See where admb is
65
- if : matrix.config.os == 'macos-13'
65
+ if : matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
66
66
run : |
67
67
cd admb && ls
68
68
- name : Compile admb, macOS
69
- if : matrix.config.os == 'macos-13'
69
+ if : matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
70
70
run : |
71
71
cd admb && make -j 4
72
72
- name : Change permissions of admb and put in path, macOS
73
- if : matrix.config.os == 'macos-13'
73
+ if : matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
74
74
run : |
75
75
sudo mv admb /usr/local/bin
76
76
sudo chmod 755 /usr/local/bin/admb
@@ -199,7 +199,7 @@ jobs:
199
199
mv SS330/ss3_opt.exe SS330/ss3_opt_win.exe
200
200
201
201
- name : Build stock synthesis for mac with admb from source
202
- if : matrix.config.os == 'macos-13'
202
+ if : matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
203
203
run : |
204
204
rm -rf SS330
205
205
rm -rf ss3_osx.tar
@@ -208,21 +208,21 @@ jobs:
208
208
/bin/bash ./Make_SS_330_new.sh -b SS330
209
209
/bin/bash ./Make_SS_330_new.sh -b SS330 -o
210
210
211
- - name : Build stock synthesis for mac m2 with admb docker image
212
- if : matrix.config.os == 'macos-latest'
213
- run : |
214
- brew update
215
- brew install docker
216
- brew install --head colima
217
- colima start --arch x86_64
218
- docker pull johnoel/admb-13.2:linux
211
+ # - name: Build stock synthesis for mac m2 with admb docker image
212
+ # if: matrix.config.os == 'macos-latest'
213
+ # run: |
214
+ # brew update
215
+ # brew install docker
216
+ # brew install --head colima
217
+ # colima start --arch x86_64
218
+ # docker pull johnoel/admb-13.2:linux
219
219
220
- rm -rf SS330
221
- rm -rf ss3_osx.tar
222
- mkdir SS330
223
- chmod 777 SS330
224
- /bin/bash ./Make_SS_330_new.sh --admb docker -b SS330
225
- /bin/bash ./Make_SS_330_new.sh --admb docker -b SS330 -o
220
+ # rm -rf SS330
221
+ # rm -rf ss3_osx.tar
222
+ # mkdir SS330
223
+ # chmod 777 SS330
224
+ # /bin/bash ./Make_SS_330_new.sh --admb docker -b SS330
225
+ # /bin/bash ./Make_SS_330_new.sh --admb docker -b SS330 -o
226
226
227
227
- name : Verify binary on mac
228
228
if : matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
@@ -234,7 +234,7 @@ jobs:
234
234
if : matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
235
235
run : |
236
236
cd SS330
237
- rm *.obj *.htp *.cpp ss3_opt.tpl
237
+ rm *.obj *.htp *.cpp ss3_opt.tpl ss3.tpl
238
238
mv ss3 ss3_osx
239
239
mv ss3_opt ss3_opt_osx
240
240
0 commit comments