Merge branch 'develop' into feature/update_release_tasklist_issue

Author: climbfuji

.github/workflows/TMP_OFF/ubuntu-ci-containers-x86_64.yaml

@@ -1,14 +1,15 @@
 name: ubuntu-ci-container-x86_64-build
 on:
   # Uncomment this to test for PRs (but do not submit)
-  # pull_request:
-  #  paths-ignore:
-  #    - 'configs/sites/**'
-  #    - 'doc/**'
-  #    - '**.md'
-  #    - '.github/ISSUE_TEMPLATE/*'
-  #    - '.gitignore'
-  
+  pull_request:
+    paths-ignore:
+      - 'configs/sites/**'
+      - '!configs/sites/tier2/*.default/*'
+      - '**.md'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/*'
+      - '.gitignore'
   schedule:
     - cron: '0 8 * * *'
   workflow_dispatch:
@@ -55,12 +56,9 @@ jobs:
           DOW=$(date +%u)
           # Monday is 1 ... Sunday is 7
           if [[ $DOW == 1 || $DOW == 4 ]]; then
-            export CONTAINER=${{ inputs.container || 'docker-ubuntu-clang-mpich' }}
-            export SPECS=${{ inputs.specs || 'jedi-ci' }}
-          elif [[ $DOW == 2 ]]; then
             export CONTAINER=${{ inputs.container || 'docker-ubuntu-gcc-openmpi' }}
             export SPECS=${{ inputs.specs || 'jedi-ci' }}
-          elif [[ $DOW == 5 ]]; then
+          elif [[ $DOW == 2 || $DOW == 5 ]]; then
             export CONTAINER=${{ inputs.container || 'docker-ubuntu-gcc11-openmpi' }}
             export SPECS=${{ inputs.specs || 'jedi-ci' }}
           elif [[ $DOW == 3 || $DOW == 6 ]]; then

.github/workflows/ubuntu-ci-x86_64-gnu.yaml

@@ -1,6 +1,14 @@
 name: ubuntu-ci-c6a-x86_64-gnu-build
 on:
   pull_request:
+    paths-ignore:
+      - 'configs/sites/**'
+      - '!configs/sites/tier2/*.default/*'
+      - '**.md'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/*'
+      - '.gitignore'
   workflow_dispatch:
 
 concurrency:

.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml

@@ -1,6 +1,14 @@
 name: ubuntu-ci-c6a-x86_64-oneapi-ifx-build
 on:
   pull_request:
+    paths-ignore:
+      - 'configs/sites/**'
+      - '!configs/sites/tier2/*.default/*'
+      - '**.md'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/*'
+      - '.gitignore'
   workflow_dispatch:
 
 concurrency:

.github/workflows/ubuntu-ci-x86_64-oneapi.yaml

@@ -1,6 +1,14 @@
 name: ubuntu-ci-c6a-x86_64-oneapi-build
 on:
   pull_request:
+    paths-ignore:
+      - 'configs/sites/**'
+      - '!configs/sites/tier2/*.default/*'
+      - '**.md'
+      - '.github/CODEOWNERS'
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/*'
+      - '.gitignore'
   workflow_dispatch:
 
 concurrency:

.gitmodules

@@ -2,10 +2,6 @@
   path = spack
   url = https://github.com/jcsda/spack
   branch = spack-stack-dev
-[submodule "doc/CMakeModules"]
-  path = doc/CMakeModules
-  url = https://github.com/noaa-emc/cmakemodules
-  branch = v1.3.0
 [submodule "repos/builtin"]
   path = repos/builtin
   url = https://github.com/jcsda/spack-packages

configs/common/modules_lmod.yaml

@@ -266,6 +266,12 @@ modules:
           set:
             'UPP_INC': '{prefix}/include'
             'UPP_LIB': '{prefix}/lib/libupp.a'
+      # NOTE: This will be fixed upstream in udunits Spack package
+      # Once this is done, remove this section
+      udunits:
+        environment:
+          set:
+            'UDUNITS2_XML_PATH': '{prefix}/share/udunits/udunits2.xml'
 
       hierarchy:
       - mpi

configs/common/modules_tcl.yaml

@@ -285,3 +285,9 @@ modules:
           set:
             'UPP_INC': '{prefix}/include'
             'UPP_LIB': '{prefix}/lib/libupp.a'
+      # NOTE: This will be fixed upstream in udunits Spack package
+      # Once this is done, remove this section
+      udunits:
+        environment:
+          set:
+            'UDUNITS2_XML_PATH': '{prefix}/share/udunits/udunits2.xml'

configs/common/packages.yaml

@@ -161,6 +161,10 @@ packages:
     #gsl-lite:
     #  require:
     #  - '@0.37.0'
+    harfbuzz:
+      # cmake-based harfbuzz fails during build
+      require:
+      - one_of: ['build_system=meson', 'build_system=autotools']
     hdf:
       require:
       - '@4.2.15'

configs/common/packages_clang.yaml

@@ -13,6 +13,3 @@ packages:
     ectrans:
       require:
       - +fftw
-    ip:
-      require:
-      - '~openmp'

configs/common/packages_oneapi.yaml

@@ -43,6 +43,9 @@ packages:
     py-maturin:
       require:
       - '%gcc'
+    py-scipy:
+      require:
+      - 'cxxflags="-O1"'
     qt:
       require:
       - '%gcc'