Skip to content

Commit 3f26fa7

Browse files
authored
build macos-latest admb from source; building from docker creates an exe that won't work (#641)
1 parent 2fbbf24 commit 3f26fa7

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

.github/workflows/build-ss3.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ jobs:
5858
5959
# Build ADMB for macos-13
6060
- 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'
6262
run: |
6363
cd admb && make clean
6464
- name: See where admb is
65-
if: matrix.config.os == 'macos-13'
65+
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
6666
run: |
6767
cd admb && ls
6868
- name: Compile admb, macOS
69-
if: matrix.config.os == 'macos-13'
69+
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
7070
run: |
7171
cd admb && make -j 4
7272
- 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'
7474
run: |
7575
sudo mv admb /usr/local/bin
7676
sudo chmod 755 /usr/local/bin/admb
@@ -199,7 +199,7 @@ jobs:
199199
mv SS330/ss3_opt.exe SS330/ss3_opt_win.exe
200200
201201
- 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'
203203
run: |
204204
rm -rf SS330
205205
rm -rf ss3_osx.tar
@@ -208,21 +208,21 @@ jobs:
208208
/bin/bash ./Make_SS_330_new.sh -b SS330
209209
/bin/bash ./Make_SS_330_new.sh -b SS330 -o
210210
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
219219

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
226226

227227
- name: Verify binary on mac
228228
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
@@ -234,7 +234,7 @@ jobs:
234234
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
235235
run: |
236236
cd SS330
237-
rm *.obj *.htp *.cpp ss3_opt.tpl
237+
rm *.obj *.htp *.cpp ss3_opt.tpl ss3.tpl
238238
mv ss3 ss3_osx
239239
mv ss3_opt ss3_opt_osx
240240

0 commit comments

Comments
 (0)