diff --git a/.github/workflows/validate_yaml_files.yml b/.github/workflows/validate_yaml_files.yml index b87f59d9..449db6e6 100644 --- a/.github/workflows/validate_yaml_files.yml +++ b/.github/workflows/validate_yaml_files.yml @@ -1,14 +1,21 @@ --- + +# 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 + - uses: actions/checkout@v4 - id: yaml-lint name: yaml-lint uses: ibiqlik/action-yamllint@v3 @@ -17,7 +24,7 @@ jobs: format: colored config_file: .yamllint.yml - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: always() with: name: yamllint-logfile diff --git a/CHANGELOG.md b/CHANGELOG.md index 43ccda7c..4968ba8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Removed variable WLI from HEMCO grid comp module for compatibility with HEMCO v3.8 +- Updating CMakeLists in GEOSCHEMchem to copy all rc and yaml files to install/etc needed to run GEOS with GEOS-Chem ### Fixed diff --git a/GEOSCHEMchem_GridComp/CMakeLists.txt b/GEOSCHEMchem_GridComp/CMakeLists.txt index cf783f89..fa19b64c 100644 --- a/GEOSCHEMchem_GridComp/CMakeLists.txt +++ b/GEOSCHEMchem_GridComp/CMakeLists.txt @@ -112,3 +112,25 @@ install( FILES ${resource_files} DESTINATION etc ) + +file (GLOB resource_files1 CONFIGURE_DEPENDS + "@geos-chem/run/GEOS/*.rc" + "@geos-chem/run/GEOS/*.yml" + "@geos-chem/run/GEOS/*.yaml" + ) + +install( + FILES ${resource_files1} + DESTINATION etc + ) + +file (GLOB resource_files2 CONFIGURE_DEPENDS + "@geos-chem/run/GEOS/TransportTracers/*.rc" + "@geos-chem/run/GEOS/TransportTracers/*.yml" + "@geos-chem/run/GEOS/TransportTracers/*.yaml" + ) + +install( + FILES ${resource_files2} + DESTINATION etc/geos_chem_transport_tracers/ + )