Skip to content

Commit 84db9a1

Browse files
TravisElless-NOAATravisElless-NOAA
committed
merge develop
2 parents 4cbc422 + bc3431a commit 84db9a1

79 files changed

Lines changed: 2209 additions & 1422 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/copilot-instructions.md‎

Lines changed: 254 additions & 113 deletions
Large diffs are not rendered by default.

‎.github/workflows/bash_code_analysis.yaml‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- develop
6-
pull_request:
6+
pull_request_target: # safe as long as code is not being run
77

88
workflow_dispatch:
99

@@ -19,19 +19,35 @@ jobs:
1919
checks: write
2020

2121
steps:
22+
- name: determine hash
23+
uses: haya14busa/action-cond@v1
24+
id: hash
25+
with:
26+
cond: ${{ github.event_name == 'pull_request_target' }}
27+
if_true: ${{ github.event.pull_request.head.sha }}
28+
if_false: ''
29+
2230
- name: checkout code
2331
uses: actions/checkout@v6
2432
with:
33+
ref: ${{ steps.hash.outputs.value }}
2534
submodules: false
2635

36+
- name: determine reporter
37+
uses: haya14busa/action-cond@v1
38+
id: reporter
39+
with:
40+
cond: ${{ github.event_name == 'pull_request_target' }}
41+
if_true: 'github-pr-review'
42+
if_false: 'github-check'
43+
2744
- name: shfmt scan
2845
uses: reviewdog/action-shfmt@v1
2946
with:
3047
github_token: ${{ secrets.GITHUB_TOKEN }}
3148
filter_mode: nofilter
32-
fail_level: any
3349
level: any
34-
reviewdog_flags: '-reporter=github-pr-review'
50+
reviewdog_flags: '-reporter=${{ steps.reporter.outputs.value }} -fail-level=any'
3551
shfmt_flags: ''
3652

3753
shellcheck:
@@ -44,16 +60,33 @@ jobs:
4460
checks: write
4561

4662
steps:
63+
- name: determine hash
64+
uses: haya14busa/action-cond@v1
65+
id: hash
66+
with:
67+
cond: ${{ github.event_name == 'pull_request_target' }}
68+
if_true: ${{ github.event.pull_request.head.sha }}
69+
if_false: ''
70+
4771
- name: checkout code
4872
uses: actions/checkout@v6
4973
with:
74+
ref: ${{ steps.hash.outputs.value }}
5075
submodules: false
51-
76+
77+
- name: determine reporter
78+
uses: haya14busa/action-cond@v1
79+
id: reporter
80+
with:
81+
cond: ${{ github.event_name == 'pull_request_target' }}
82+
if_true: 'github-pr-review'
83+
if_false: 'github-check'
84+
5285
- name: shellcheck scan
5386
uses: reviewdog/action-shellcheck@v1
5487
with:
5588
github_token: ${{ secrets.GITHUB_TOKEN }}
56-
reporter: github-pr-review
89+
reporter: ${{ steps.reporter.outputs.value }}
5790
filter_mode: nofilter
5891
fail_level: any
5992
level: any

‎.gitlab-ci.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,11 @@ include:
194194
Machine="${machine^}"
195195
echo "Job failed, performing cleanup actions for ${Machine}"
196196
197+
# TODO We need to add local python env to support PyGitHub not being in Spack-Stack 1.9
198+
# this should be part of the spack environment setup in Spack-Stack 2.x
199+
PYTHONPATH=${PYTHONPATH}:$HOME/.local/lib/python3.11/site-packages
200+
echo "Updated PYTHONPATH: $PYTHONPATH"
201+
197202
# Re-setup GH if needed
198203
export GH=$(which gh 2>/dev/null || echo "${HOME}/bin/gh")
199204
if [ ! -x "${GH}" ]; then

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Read The Docs Status](https://readthedocs.org/projects/global-workflow/badge/?badge=latest)](http://global-workflow.readthedocs.io/)
2-
[![shellnorms](https://github.com/NOAA-EMC/global-workflow/actions/workflows/linters.yaml/badge.svg)](https://github.com/NOAA-EMC/global-workflow/actions/workflows/linters.yaml)
3-
[![pynorms](https://github.com/NOAA-EMC/global-workflow/actions/workflows/pynorms.yaml/badge.svg)](https://github.com/NOAA-EMC/global-workflow/actions/workflows/pynorms.yaml)
2+
[![bash code analysis](https://github.com/NOAA-EMC/global-workflow/workflows/bash_code_analysis/badge.svg?branch=develop&event=push)](https://github.com/NOAA-EMC/global-workflow/actions?query=workflow%3Abash_code_analysis+event%3Apush+branch%3Adevelop)
3+
[![python code analysis](https://github.com/NOAA-EMC/global-workflow/workflows/python_code_analysis/badge.svg)](https://github.com/NOAA-EMC/global-workflow/actions?query=workflow%3Apython_code_analysis+event%3Apush+branch%3Adevelop)
44
![Custom badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/emcbot/e35aa2904a54deae6bbb1fdc2d960c71/raw/wcoss2.json)
55

66
![Custom badge](https://gist.githubusercontent.com/emcbot/66059582886cb5c2485ff64bf24e7f93/raw/ursa_pipeline_badge.svg)
@@ -29,7 +29,7 @@ The Global Workflow currently supports the following machines at the indicated t
2929
| HPC | Tier | Notes |
3030
| --------------------------------------- |:----:|:--------------------------------------------------------------------------:|
3131
| WCOSS2<br>NCO | 1 | |
32-
| Ursa<br>NOAA RDHPCS | 1 | GCAFS system not supported yet. |
32+
| Ursa<br>NOAA RDHPCS | 1 | |
3333
| Hercules<br>MSU | 1 | |
3434
| Gaea C6<br>RDHPCS | 1 | |
3535
| Hera<br>NOAA RDHPCS | 2 | |

‎dev/ci/cases/pr/C96_gcafs_cycled.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ experiment:
1717
skip_ci_on_hosts:
1818
- gaeac5
1919
- awsepicglobalworkflow
20-
- ursa
2120

2221
workflow:
2322
engine: rocoto

‎dev/ci/cases/pr/C96_gcafs_cycled_noDA.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ skip_ci_on_hosts:
1919
- gaeac5
2020
- hercules
2121
- awsepicglobalworkflow
22-
- ursa
2322

2423
workflow:
2524
engine: rocoto

dev/ci/cases/pr/C96mx025_S2S.yaml renamed to dev/ci/cases/sfsv1/C96mx025_S2S.yaml

File renamed without changes.

dev/ci/cases/sfs/C96mx100_S2S.yaml renamed to dev/ci/cases/sfsv1/C96mx100_S2S.yaml

File renamed without changes.

‎dev/ci/gitlab-ci-hosts.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222

2323
# Template matrices for case lists
2424
.hera_cases_matrix: &hera_cases
25-
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48_ufsgsi_hybatmDA", "C96C48_ufs_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA", "C96mx100_S2S", "C96mx025_S2S"]
25+
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48_ufsgsi_hybatmDA", "C96C48_ufs_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA", "C96mx100_S2S"]
2626

2727
.gaeac6_cases_matrix: &gaeac6_cases
28-
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA", "C96mx100_S2S", "C96mx025_S2S"]
28+
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA", "C96mx100_S2S"]
2929

3030
.orion_cases_matrix: &orion_cases
31-
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C96C48_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled", "C96mx025_S2S"]
31+
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C96C48_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled"]
3232

3333
.hercules_cases_matrix: &hercules_cases
34-
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled", "C96mx025_S2S"]
34+
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled"]
3535

3636
.ursa_cases_matrix: &ursa_cases
37-
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48_ufsgsi_hybatmDA", "C96C48_ufs_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96mx025_S2S"]
37+
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48_ufsgsi_hybatmDA", "C96C48_ufs_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA"]
3838

3939
# Host: Hera - Standard Cases
4040
setup_experiments-hera:
@@ -277,7 +277,7 @@ setup_ctests-hera:
277277

278278
setup_ctests-gaeac6:
279279
extends: .setup_ctests_template
280-
stage: setup_tests
280+
stage: setup_tests
281281
tags:
282282
- gaeac6
283283
variables:

‎dev/ci/scripts/utils/ci_utils.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ function build() {
244244
echo "Creating logs folder"
245245
mkdir -p "${logs_dir}" || exit 1
246246
fi
247-
"${HOMEgfs_}/sorc/build_compute.sh" -A "${HPC_ACCOUNT}" all
247+
"${HOMEgfs_}/sorc/build_all.sh" -c -A "${HPC_ACCOUNT}" all
248248

249249
}
250250

0 commit comments

Comments
 (0)