Skip to content

Commit

Permalink
try macos-15 with build-ss3.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
e-perl-NOAA authored Sep 30, 2024
1 parent eb098e2 commit 6ea781b
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/build-ss3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
- {os: windows-latest}
- {os: macos-13}
- {os: macos-latest}
- {os: macos-15}
- {os: ubuntu-latest}
# Limit run time to 90 min to avoid wasting action minutes.
# was set to 15 and then 30 minutes previously, but compiling admb
Expand Down Expand Up @@ -97,7 +98,7 @@ jobs:
- name: Get the last tag on unix (macOS and linux)
id: get-latest-tag-unix
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest' || matrix.config.os == 'ubuntu-latest'
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest' || matrix.config.os == 'macos-15' || matrix.config.os == 'ubuntu-latest'
run: |
git tag
latest_tag=$(git describe --abbrev=0 --tags)
Expand All @@ -109,7 +110,7 @@ jobs:
- name: Pull the last tag value to use in the Rscript on unix (macOS and linux)
id: get-version-unix
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest' || matrix.config.os == 'ubuntu-latest'
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest' || matrix.config.os == 'macos-15' || matrix.config.os == 'ubuntu-latest'
run: |
echo "${{ steps.get-latest-tag-unix.outputs.tag }}" > .github/last_tag.txt
echo "${{ steps.get-latest-tag-unix.outputs.tag_commit }}" > .github/last_tag_commit.txt
Expand Down Expand Up @@ -210,7 +211,7 @@ jobs:
- name: Build stock synthesis for mac m2 with admb docker image
if: matrix.config.os == 'macos-latest'
if: matrix.config.os == 'macos-latest' || matrix.config.os == 'macos-15'
run: |
brew update
brew install docker
Expand All @@ -226,13 +227,13 @@ jobs:
/bin/bash ./Make_SS_330_new.sh --admb docker -b SS330 -o
- name: Verify binary on mac
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest' || matrix.config.os == 'macos-15'
run: |
shasum -a 256 SS330/ss3
shasum -a 256 SS330/ss3_opt
- name: Delete unneeded files and change exe names on mac
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest'
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-latest' || matrix.config.os == 'macos-15'
run: |
cd SS330
rm *.obj *.htp *.cpp ss3_opt.tpl
Expand Down

0 comments on commit 6ea781b

Please sign in to comment.