Skip to content

Commit

Permalink
upgraded g2 in workflows (#239)
Browse files Browse the repository at this point in the history
* upgraded g2 in workflows

* upgraded g2 in workflows

* upgraded g2 in workflows

* fixing intel workflow

* updating workflows

* trying to get Intel workflow working

* workflow
  • Loading branch information
edwardhartnett authored Aug 28, 2023
1 parent 9ce4204 commit ab53cec
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/Intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: cache-jasper
id: cache-jasper
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/jasper
key: jasper-Intel-${{ matrix.compilers }}-2.0.33
Expand All @@ -65,7 +65,7 @@ jobs:
- name: cache-bacio
id: cache-bacio
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/bacio
key: bacio-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
Expand All @@ -89,7 +89,7 @@ jobs:
- name: cache-sp
id: cache-sp
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/sp
key: sp-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
Expand All @@ -114,7 +114,7 @@ jobs:
- name: cache-w3emc
id: cache-w3emc
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/w3emc
key: w3emc-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
Expand All @@ -139,7 +139,7 @@ jobs:
- name: cache-ip
id: cache-ip
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/ip
key: ip-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
Expand All @@ -164,7 +164,7 @@ jobs:
- name: cache-g2
id: cache-g2
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/g2
key: g2-Intel-${{ matrix.compilers }}-${{ runner.os }}-develop
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/Linux_external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: true
matrix:
g2-version: [develop, v3.5.x]
g2-version: [develop, v3.4.6]
bacio-version: [2.5.0]
jasper-version: [2.0.33, 3.0.5, 4.0.0]
w3emc-version: [2.10.0]
Expand All @@ -35,7 +35,7 @@ jobs:
- name: cache-jasper
id: cache-jasper
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/jasper
key: jasper-Linux_versions-${{ matrix.jasper-version }}
Expand All @@ -59,7 +59,7 @@ jobs:
- name: cache-bacio
id: cache-bacio
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/bacio
key: bacio-${{ runner.os }}-v${{ matrix.bacio-version }}
Expand All @@ -83,7 +83,7 @@ jobs:
- name: cache-sp
id: cache-sp
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/sp
key: sp-${{ runner.os }}-2.3.3-1
Expand All @@ -108,7 +108,7 @@ jobs:
- name: cache-w3emc
id: cache-w3emc
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/w3emc
key: w3emc-${{ runner.os }}-${{ matrix.w3emc-version }}-bacio-${{ matrix.bacio-version }}
Expand All @@ -133,7 +133,7 @@ jobs:
- name: cache-ip
id: cache-ip
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/ip
key: ip-${{ runner.os }}-4.1.0
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/Linux_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: true
matrix:
g2-version: [3.4.5, 3.5.x]
g2-version: [3.4.5, 3.4.6]
bacio-version: [2.4.1, 2.5.0]
jasper-version: [2.0.33]
w3emc-version: [2.10.0]
Expand All @@ -36,7 +36,7 @@ jobs:
- name: cache-jasper
id: cache-jasper
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/jasper
key: jasper-Linux_versions-${{ matrix.jasper-version }}
Expand All @@ -60,7 +60,7 @@ jobs:
- name: cache-bacio
id: cache-bacio
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/bacio
key: bacio-${{ runner.os }}-v${{ matrix.bacio-version }}
Expand All @@ -84,7 +84,7 @@ jobs:
- name: cache-sp
id: cache-sp
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/sp
key: sp-${{ runner.os }}-2.3.3-1
Expand All @@ -109,7 +109,7 @@ jobs:
- name: cache-w3emc
id: cache-w3emc
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/w3emc
key: w3emc-${{ runner.os }}-${{ matrix.w3emc-version }}-bacio-${{ matrix.bacio-version }}
Expand All @@ -134,7 +134,7 @@ jobs:
- name: cache-ip
id: cache-ip
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/ip
key: ip-${{ runner.os }}-${{ matrix.ip-version }}
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
- name: cache-g2
id: cache-g2
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/g2
key: g2-${{ runner.os }}-${{ matrix.bacio-version }}-${{ matrix.jasper-version }}-${{ matrix.w3emc-version }}-${{ matrix.g2-version }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/MacOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: cache-jasper
id: cache-jasper
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/jasper
key: jasper-MacOS-${{ runner.os }}-2.0.33
Expand All @@ -50,7 +50,7 @@ jobs:
- name: cache-bacio
id: cache-bacio
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/bacio
key: bacio-MacOS-${{ runner.os }}-2.5.0
Expand All @@ -74,7 +74,7 @@ jobs:
- name: cache-sp
id: cache-sp
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/sp
key: sp-${{ runner.os }}-2.3.3-1
Expand All @@ -99,7 +99,7 @@ jobs:
- name: cache-w3emc
id: cache-w3emc
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/w3emc
key: w3emc-MacOS-${{ runner.os }}-2.10.0
Expand All @@ -124,7 +124,7 @@ jobs:
- name: cache-ip
id: cache-ip
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/ip
key: ip-MacOS-${{ runner.os }}-4.1.0
Expand All @@ -149,18 +149,18 @@ jobs:
- name: cache-g2
id: cache-g2
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/g2
key: g2-MacOS-${{ runner.os }}-2.0.33-2.5.0-3.4.5
key: g2-MacOS-${{ runner.os }}-2.0.33-2.5.0-3.4.6

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

- name: build-g2
if: steps.cache-g2.outputs.cache-hit != 'true'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/developer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: true
matrix:
g2-branch: [develop, v3.5.x]
g2-branch: [develop, v3.4.6]

steps:
- name: install-dependencies
Expand All @@ -41,7 +41,7 @@ jobs:

- name: cache-jasper
id: cache-jasper
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/jasper
key: jasper-${{ runner.os }}-2.0.32
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
- name: cache-sp
id: cache-sp
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/sp
key: sp-developer-${{ runner.os }}-2.3.3
Expand Down

0 comments on commit ab53cec

Please sign in to comment.