Merge branch 'main' into feature/adarmenov/#122-wmma

.circleci/config.yml

@@ -1,37 +1,42 @@
 version: 2.1
+
+orbs:
+  circleci-tools: geos-esm/[email protected]
+
+workflows:
+  build-test:
+    jobs:
+      - build-GEOSgcm:
+          name: build-GEOSgcm-on-<< matrix.compiler >>
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          context:
+            - docker-hub-creds
+
 jobs:
-  build:
-    docker:
-      - image: gmao/ubuntu20-geos-env-mkl:6.0.16-openmpi_4.0.5-gcc_10.2.0
-    resource_class: xlarge
+  build-GEOSgcm:
+    parameters:
+      compiler:
+        type: string
+    executor:
+      name: circleci-tools/<< parameters.compiler >>
+      resource_class: large
     working_directory: /root/project
     steps:
       - run:
-          name: "GEOS_Shared branch"
+          name: "GMAO_Shared branch"
           command: echo ${CIRCLE_BRANCH}
-      - checkout
-      - run:
-          name: "Checkout GEOSgcm fixture and update GEOS_Shared branch"
-          command: |
-            cd ${CIRCLE_WORKING_DIRECTORY}
-            git clone [email protected]:GEOS-ESM/GEOSgcm.git
-            cd GEOSgcm
-            mepo clone
-            mepo develop GEOSgcm_GridComp GEOSgcm_App
-            if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "master" ] && [ "${CIRCLE_BRANCH}" != "main" ]
-            then
-               mepo checkout-if-exists ${CIRCLE_BRANCH}
-            fi
-            mepo status
-      - run:
-          name: "CMake"
-          command: |
-            cd ${CIRCLE_WORKING_DIRECTORY}/GEOSgcm
-            mkdir build
-            cd build
-            cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_BUILD_TYPE=Debug
-      - run:
-          name: "Build"
-          command: |
-            cd ${CIRCLE_WORKING_DIRECTORY}/GEOSgcm/build
-            make -j"$(nproc)" install
+      - circleci-tools/versions:
+          compiler: << parameters.compiler >>
+      - circleci-tools/checkout_fixture
+      - circleci-tools/mepoclone
+      - circleci-tools/mepodevelop
+      - circleci-tools/checkout_if_exists
+      - circleci-tools/cmake:
+          compiler: << parameters.compiler >>
+      - circleci-tools/buildinstall
+      - circleci-tools/compress_artifacts
+      - store_artifacts:
+          path: /logfiles
+

.github/CODEOWNERS

@@ -18,5 +18,9 @@
 # Yuri owns the coupled plots
 /GEOS_Util/coupled_diagnostics/ @yvikhlya 
 
+# The Python Transition Team will own Python files
+# until the Python 3 transition is completed
+*.py @GEOS-ESM/python-transition-team
+
 # The GEOS CMake Team is the CODEOWNER for the CMakeLists.txt files in this repository
 CMakeLists.txt @GEOS-ESM/cmake-team

.github/workflows/changelog-enforcer.yml

@@ -8,9 +8,16 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: dangoslen/changelog-enforcer@v1.2.0
+    - uses: actions/checkout@v2
+    - uses: dangoslen/changelog-enforcer@v2
       with:
         changeLogPath: 'CHANGELOG.md'
-        skipLabel: '0 diff trivial'
+        skipLabels: 'Skip Changelog'
+        missingUpdateErrorMessage: >
+            No update to CHANGELOG.md found! Please add a changelog
+            entry to it describing your change.  Please note that the
+            keepachangelog (https://keepachangelog.com) format is
+            used. If your change is very trivial not applicable for a
+            changelog entry, add a 'Skip Changelog' label to the pull
+            request to skip the changelog enforcer.