Skip to content

Commit

Permalink
updated sp/ip to use develop branches in grib_util workflow, updated …
Browse files Browse the repository at this point in the history
…dependency versions in workflows (#559)

* updated sp/ip to use develop branches in grib_util workflow

* updated dependency versions in workflows

* updated dependency versions in workflows

* updated dependency versions in workflows

* updated dependency versions in workflows
  • Loading branch information
edwardhartnett authored Sep 13, 2023
1 parent 43399d0 commit 59e6feb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/Linux_options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
strategy:
# fail-fast: true
matrix:
bacio-version: [2.5.0]
w3emc-version: [2.9.3]
bacio-version: [2.6.0]
w3emc-version: [2.10.0]
config:
- {
options: "-DCMAKE_BUILD_TYPE=Debug"
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
cd w3emc
mkdir build
cd build
cmake .. -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc
cmake -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc -DBUILD_WITH_BUFR=OFF ..
make -j2
make install
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/Linux_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
fail-fast: true
matrix:
jasper-version: [2.0.33, 3.0.5, 4.0.0]
bacio-version: [2.4.1, 2.5.0]
w3emc-version: [2.9.2, 2.9.3]
bacio-version: [2.4.1, 2.5.0, 2.6.0]
w3emc-version: [2.9.2, 2.9.3, 2.10.0]

steps:

Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/w3emc
key: w3emc-${{ runner.os }}-${{ matrix.w3emc-version }}-${{ matrix.bacio-version }}
key: w3emc-${{ runner.os }}-${{ matrix.w3emc-version }}-${{ matrix.bacio-version }}-1

- name: checkout-w3emc
if: steps.cache-w3emc.outputs.cache-hit != 'true'
Expand All @@ -80,7 +80,7 @@ jobs:
cd w3emc
mkdir build
cd build
cmake .. -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc
cmake -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc -DBUILD_WITH_BUFR=OFF ..
make -j2
make install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/MacOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
strategy:
fail-fast: true
matrix:
jasper-version: [3.0.3]
bacio-version: [2.4.1, 2.5.0]
jasper-version: [3.0.3, 4.0.0]
bacio-version: [2.4.1, 2.5.0, 2.6.0]

steps:
- name: install-dependencies
Expand Down
13 changes: 2 additions & 11 deletions .github/workflows/grib_utils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,14 @@ jobs:
path: w3emc
ref: develop

- name: cache-sp
id: cache-sp
uses: actions/cache@v3
with:
path: ~/sp
key: sp-developer-${{ runner.os }}-2.3.3

- name: checkout-sp
if: steps.cache-sp.outputs.cache-hit != 'true'
uses: actions/checkout@v3
with:
repository: NOAA-EMC/NCEPLIBS-sp
path: sp
ref: v2.3.3
ref: develop

- name: build-sp
if: steps.cache-sp.outputs.cache-hit != 'true'
run: |
cd sp
mkdir build
Expand All @@ -109,7 +100,7 @@ jobs:
with:
repository: NOAA-EMC/NCEPLIBS-ip
path: ip
ref: v3.3.3
ref: develop

- name: build-ip
run: |
Expand Down

0 comments on commit 59e6feb

Please sign in to comment.