GCClassic 14.7.0 release

.github/workflows/cloud-benchmarking-workflow.yml

@@ -1,58 +1,65 @@
 # Release pipeline:
-# 
+#
 # This pipeline triggers the cloud-based benchmarking workflow
-# upon pushes to the dev environment. The benchmarking workflow 
+# upon pushes to the dev environment. The benchmarking workflow
 # infrastructure code can be found in the following repository:
 # https://github.com/geoschem/gc-cloud-infrastructure
 #
 # This pipeline is triggered by pushes to dev
 #
 # Notes:
 #   - This workflow requires aws credentials necessary to
-#     trigger the benchmarking step function via the aws cli. 
-#     The credentials need step function permissions and can 
-#     be added to the repo as an action secret called 
+#     trigger the benchmarking step function via the aws cli.
+#     The credentials need step function permissions and can
+#     be added to the repo as an action secret called
 #     AWS_SECRET_ACCESS_KEY and AWS_ACCESS_KEY_ID.
 
 name: cloud_benchmarking
 on:
   push:
     branches:
-      - dev**
+      - dev/*
     tags:
       - '*'
   pull_request:
     branches:
-      - dev**
+      - dev/*
 
 jobs:
   trigger_step_function:
     runs-on: ubuntu-latest # aws cli comes pre-installed
     steps:
+
       # for now both use Spot instances -- may need to update to use on demand
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
+
+      # By default we use 1Hr benchmarks
       - name: Set Initial Variables
-        # By default we use 1Hr benchmarks
         run: |
           echo "TIME_PERIOD=1Hr" >> $GITHUB_ENV
           echo "RESOLUTION=4x5" >> $GITHUB_ENV
-          echo "GITHUB_SHA_SHORT=`echo ${GITHUB_SHA} | cut -c1-7`" >> $GITHUB_ENV
-          echo "COMMIT_NAME=`echo ${GITHUB_SHA} | cut -c1-7`" >> $GITHUB_ENV
-      # conditionally overwrite variables if a tag was the triggering event
+          echo "GITHUB_SHA_SHORT=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
+          echo "COMMIT_NAME=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
+
+      # Conditionally overwrite variables if a tag was the triggering event
       - name: Reset Initial Variables for pull request
-        run: |
-          echo "GITHUB_SHA_SHORT=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV
-          echo "COMMIT_NAME=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV
         if: github.event_name == 'pull_request'
+        env:
+          GITHUB_SHA_SHORT: ${{ github.event.pull_request.head.sha }}
+        run: |
+          echo "GITHUB_SHA_SHORT=${GITHUB_SHA_SHORT:0:7}" >> $GITHUB_ENV
+          echo "COMMIT_NAME=${GITHUB_SHA_SHORT:0:7}" >> $GITHUB_ENV
+
+      # We do a 1Month benchmark for tags
       - name: Reset Variables For Tags
-        # We do a 1Month benchmark for tags
+        if: startsWith(github.ref, 'refs/tags/')
         run: |
           echo "TIME_PERIOD=1Mon" >> $GITHUB_ENV
           echo "COMMIT_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
-        if: startsWith(github.ref, 'refs/tags/')
+
       - name: Generate Primary Key
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -63,6 +70,7 @@ jobs:
           cd ${{ github.workspace }}
           echo "DEV_PRIMARY_KEY=gcc-${RESOLUTION}-${TIME_PERIOD}-`git describe --tags`" >> $GITHUB_ENV
           echo "REF_PRIMARY_KEY=`./.github/workflows/findRefKey.sh ${RESOLUTION} ${TIME_PERIOD} ${GITHUB_SHA}`" >> $GITHUB_ENV
+
       - name: Trigger Step Function
         env:
           # Set config options for aws cli
@@ -88,7 +96,7 @@ jobs:
                 `"\"timePeriod\": \"${TIME_PERIOD}\","`
                 `"\"tag\": \"${COMMIT_NAME}\","`
                 `"\"numCores\": \"${NUM_CORES}\","`
-                `"\"memory\": \"40000\","` 
+                `"\"memory\": \"40000\","`
                 `"\"resolution\": \"${RESOLUTION}\","`
                 `"\"sendEmailNotification\": \"true\""`
               `"},"`

.github/workflows/gcclassic-compile-tests.yml

@@ -1,7 +1,13 @@
+#
+# GitHub Actions configuration file to perform "compile-only"
+# integration tests for GEOS-Chem Classic that are triggered by
+# push or pull requests.
+#
 name: gcclassic-compile-tests
 
 on: [pull_request, push]
 
+# Cancel running jobs if new commits are pushed
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
   cancel-in-progress: true

.github/workflows/lint-ci-workflows.yml

@@ -3,45 +3,64 @@ name: Lint
 
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on pushes to the "main" branch, i.e., PR merges
+  # Triggers the workflow on pushes to the "main" or "dev/"* branches,
+  # i.e., PR merges
   push:
-    branches: [ "main" ]
+    branches: [ "main", "dev/*" ]
 
   # Triggers the workflow on pushes to open pull requests with code changes
   pull_request:
     paths:
       - '.github/workflows/*.yml'
 
   # Allows you to run this workflow manually from the Actions tab
+  # (usually leave it blank)
   workflow_dispatch:
 
+# Allow the jobs to read the secret GitHub token
+permissions:
+  contents: read
+
 # Cancel jobs running if new commits are pushed
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 # Workflow run - one or more jobs that can run sequentially or in parallel
 jobs:
+
   # This workflow contains a single job called "lint"
   lint:
+
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
+
+    # Don't quit the Action at the first 
     strategy:
       fail-fast: false
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
+    # GitHub secret token
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    # Steps represent a sequence of tasks that will be
+    # executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+
+      # Checks-out your repository under $GITHUB_WORKSPACE,
+      # so your job can access it
       - name: Checkout code
         with:
           persist-credentials: false
         uses: actions/checkout@v4
 
+      # Installs Python 3.x
       - name: Install Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
+      # Installs Python packages
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip