From 62cb6dccb9e4c5a9741f59d73f81f8deb1974c35 Mon Sep 17 00:00:00 2001 From: Mike Manyin Date: Tue, 7 Jul 2026 11:28:39 -0400 Subject: [PATCH 1/3] Copy special CF version of resource files from geos-chem to etc/, including HEMCO, GAAS, ACHEM, GOCART2G, CH4 and CO2 files --- GEOSCHEMchem_GridComp/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GEOSCHEMchem_GridComp/CMakeLists.txt b/GEOSCHEMchem_GridComp/CMakeLists.txt index cb9a0f07..5de1bd18 100644 --- a/GEOSCHEMchem_GridComp/CMakeLists.txt +++ b/GEOSCHEMchem_GridComp/CMakeLists.txt @@ -117,6 +117,8 @@ file (GLOB resource_files1 CONFIGURE_DEPENDS "@geos-chem/run/GEOS/*.rc" "@geos-chem/run/GEOS/geos*.yml" "@geos-chem/run/GEOS/geos*.yaml" + "@geos-chem/run/GEOS/GEOS*.yaml" + "@geos-chem/run/GEOS/CF.*.yaml" "@geos-chem/run/shared/species*.yml" ) From 8be3fb71a2818f76b02e0051204ae30589f80781 Mon Sep 17 00:00:00 2001 From: Mike Manyin Date: Thu, 16 Jul 2026 11:16:59 -0400 Subject: [PATCH 2/3] Edit CHANGELOG, toward v1.10.2+CFv2.0.1 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f9be608..2e8c435b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,11 @@ after October 2021. For earlier changes, consult file ChangeLog. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [Unreleased - working on a CF release] ### Added + +- Added CF-specific resource files to the set copied from geos-chem into etc/ during build. + ### Removed ### Changed ### Fixed From 393651cc6358ec1bec2b2a584aef581ec86efe8d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jul 2026 13:18:43 -0400 Subject: [PATCH 3/3] Fix up yaml linter --- .github/workflows/validate_yaml_files.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate_yaml_files.yml b/.github/workflows/validate_yaml_files.yml index b87f59d9..a1cf65fa 100644 --- a/.github/workflows/validate_yaml_files.yml +++ b/.github/workflows/validate_yaml_files.yml @@ -1,14 +1,25 @@ --- + +# Based on code from https://github.com/marketplace/actions/yaml-lint + name: Yaml Lint on: pull_request: types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled] + +# This validation is equivalent to running on the command line: +# yamllint -d relaxed --no-warnings +# and is controlled by the .yamllint.yml file jobs: validate-YAML: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout repo + uses: actions/checkout@v7 + with: + fetch-depth: 0 + filter: blob:none - id: yaml-lint name: yaml-lint uses: ibiqlik/action-yamllint@v3 @@ -17,7 +28,7 @@ jobs: format: colored config_file: .yamllint.yml - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v7 if: always() with: name: yamllint-logfile