Merge branch 'develop' into feature_2575_tci_general_model

.github/jobs/docker_build_metplus_images.sh

@@ -16,12 +16,19 @@ fi
 # remove v prefix
 metplus_version=${SOURCE_BRANCH:1}
 
+# if rc is in version number, get main_vX.Y, otherwise get X.Y-latest or develop
+if [[ "${metplus_version}" =~ rc ]]; then
+  tag_format="main_v{X}.{Y}"
+else
+  tag_format="{X}.{Y}-latest"
+fi
+
 # Get MET tag and adjust MET Docker repo if develop
-met_tag=$("${GITHUB_WORKSPACE}"/metplus/component_versions.py -v "${metplus_version}" -o MET -f "{X}.{Y}-latest" --no-get_dev_version)
+met_tag=$("${GITHUB_WORKSPACE}"/metplus/component_versions.py -v "${metplus_version}" -o MET -f ${tag_format} --no-get_dev_version)
 echo "$met_tag"
 
 MET_DOCKER_REPO=met
-if [ "$met_tag" == "develop" ]; then
+if [ "$met_tag" == "develop" ] || [[ "${met_tag}" =~ ^main_v[0-9]+\.[0-9]+ ]]; then
     MET_DOCKER_REPO=met-dev
 fi
 

.github/jobs/docker_setup.sh

@@ -32,10 +32,18 @@ echo "TIMING: docker pull ${DOCKERHUB_TAG} took `printf '%02d' $(($duration / 60
 export DOCKERFILE_PATH=${GITHUB_WORKSPACE}/internal/scripts/docker/Dockerfile
 
 metplus_version=$(head -n 1 "${GITHUB_WORKSPACE}/metplus/VERSION")
-MET_TAG=$("${GITHUB_WORKSPACE}"/metplus/component_versions.py -v "${metplus_version}" -o MET -f "{X}.{Y}-latest" --no-get_dev_version)
+
+# if rc is in version number, get main_vX.Y, otherwise get X.Y-latest or develop
+if [[ "${metplus_version}" =~ rc ]]; then
+  tag_format="main_v{X}.{Y}"
+else
+  tag_format="{X}.{Y}-latest"
+fi
+
+MET_TAG=$("${GITHUB_WORKSPACE}"/metplus/component_versions.py -v "${metplus_version}" -o MET -f ${tag_format} --no-get_dev_version)
 
 MET_DOCKER_REPO=met-dev
-if [ "${MET_TAG}" != "develop" ]; then
+if [ "${MET_TAG}" != "develop" ] && ! [[ "${MET_TAG}" =~ ^main_v[0-9]+\.[0-9]+ ]]; then
     MET_DOCKER_REPO=met
 elif [ "${EXTERNAL_TRIGGER}" == "true" ]; then
     # if MET tag is develop and external repo triggered workflow

.github/parm/use_case_groups.json

@@ -104,6 +104,13 @@
     "index_list": "10",
     "run": false
   },
+  {
+    "category": "marine_and_cryosphere",
+    "index_list": "11",
+    "disabled": true,
+    "disabled_reason": "exceeds GitHub Actions environment limits",
+    "run": false
+  },
   {
     "category": "medium_range",
     "index_list": "0",
@@ -234,6 +241,22 @@
     "index_list": "0",
     "run": false
   },
+  {
+    "category": "s2s_stratosphere",
+    "index_list": "1",
+    "disabled": true,
+    "disabled_reason": "exceeds GitHub Actions environment limits",
+    "data_location": "v6.0/additional_data_UserScript_fcstGFS_obsERA_StratospherePolar.tgz",
+    "run": false
+  },
+  {
+    "category": "s2s_stratosphere",
+    "index_list": "2",
+    "disabled": true,
+    "disabled_reason": "exceeds GitHub Actions environment limits",
+    "data_location": "v6.0/additional_data_UserScript_fcstGFS_obsERA_StratosphereQBO.tgz",
+    "run": false
+  },
   {
     "category": "short_range",
     "index_list": "0",
@@ -278,12 +301,14 @@
     "category": "short_range",
     "index_list": "14",
     "disabled": true,
+    "disabled_reason": "need new RRFS data with new line types",
     "run": false
   },
   {
     "category": "short_range",
     "index_list": "15",
     "disabled": true,
+    "disabled_reason": "exceeds GitHub Actions environment limits",
     "run":false
   },
   {

.github/workflows/create_conda_envs.yml

@@ -283,6 +283,20 @@ jobs:
       - run: .github/jobs/build_conda_image.sh
       - run: .github/jobs/push_conda_image.sh
 
+  mp_analysis:
+    if: |
+      always() && (needs.check.outputs.no_skip == 'true' ||
+      contains(fromJSON(needs.check.outputs.run_list), 'mp_analysis'))
+    runs-on: ubuntu-latest
+    needs: [check,metplotpy]
+    env:
+      ENV_NAME: ${{ github.job }}
+      BASE_ENV: metplotpy
+    steps:
+      - uses: actions/checkout@v4
+      - run: .github/jobs/build_conda_image.sh
+      - run: .github/jobs/push_conda_image.sh
+
   diff:
     if: |
       always() && (needs.check.outputs.no_skip == 'true' ||

.github/workflows/sonarqube.yml

@@ -14,8 +14,6 @@ on:
       - '.github/pull_request_template.md'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/labels/**'
-      - 'build_components/**'
-      - 'manage_externals/**'
       - '**/README.md'
       - '**/LICENSE.md'
 
@@ -30,8 +28,6 @@ on:
       - '.github/pull_request_template.md'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/labels/**'
-      - 'build_components/**'
-      - 'manage_externals/**'
       - '**/README.md'
       - '**/LICENSE.md'
 

.github/workflows/testing.yml

@@ -14,8 +14,6 @@ on:
       - '.github/pull_request_template.md'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/labels/**'
-      - 'build_components/**'
-      - 'manage_externals/**'
       - '**/README.md'
       - '**/LICENSE.md'
 
@@ -29,8 +27,6 @@ on:
       - '.github/pull_request_template.md'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/labels/**'
-      - 'build_components/**'
-      - 'manage_externals/**'
       - '**/README.md'
       - '**/LICENSE.md'
 
@@ -59,6 +55,9 @@ jobs:
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: echo "$GITHUB_CONTEXT"
+        # continue if this step fails, which can happen when the merge commit
+        # message is too long
+        continue-on-error: true
       - name: Build URL for commit that triggered workflow
         if: github.event_name == 'workflow_dispatch'
         run: echo https://github.com/${{ github.event.inputs.repository }}/commit/${{ github.event.inputs.sha }}

.github/workflows/update_truth.yml

@@ -65,11 +65,11 @@ jobs:
           # get truth change log from *-ref branch
           cmd="git checkout origin/${branch_name}-ref -- ${change_log_path}"
           echo $cmd
-          $cmd
+          $cmd || true
 
           # create or append to file to track truth data changes
           # and ensure that PR merge into *-ref branch triggered testing workflow
-          change_entry="[$(date +%Y%m%d_%H:%M:%S) ${branch_name}] ${{ github.event.inputs.pull_requests }} - ${{ github.event.inputs.change_summary }}"
+          change_entry='[$(date +%Y%m%d_%H:%M:%S) ${branch_name}] ${{ github.event.inputs.pull_requests }} - ${{ github.event.inputs.change_summary }}'
           echo "${change_entry}" >> ${change_log_path}
 
           # add file if it does not already exist