From f16498759c2378761129237ba8033752196c68b9 Mon Sep 17 00:00:00 2001 From: Johannes Keller Date: Fri, 11 Jul 2025 09:55:29 +0200 Subject: [PATCH] CI: Enable eCLM-PDAF build --- .github/workflows/CI.yml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7217c9c..f5f179d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -28,17 +28,16 @@ jobs: parflow_dir: "parflow", model_opts: "--eCLM --ParFlowGPU" } -# TODO - Fix PDAF GNU errors # - { # name: "CLM3.5-PDAF", # use_oasis: "False", # model_opts: "--CLM35 --PDAF" # } -# - { -# name: "eCLM-PDAF", -# use_oasis: "False", -# model_opts: "--eCLM --PDAF" -# } + - { + name: "eCLM-PDAF", + use_oasis: "False", + model_opts: "--eCLM --PDAF" + } # - { # name: "CLM3.5-ParFlow-PDAF", # use_oasis: "True", @@ -328,12 +327,11 @@ jobs: echo "VER_ICON=${VER_ICON}" >> $GITHUB_OUTPUT fi - # TODO - Fix PDAF GNU errors - # if [[ "${{ matrix.config.name }}" == *"PDAF"* ]]; then - # VER_PDAF=$(cat model_versions | grep -w "pdaf" | cut -d' ' -f1) - # echo "${VER_PDAF} => VER_PDAF" - # echo "VER_PDAF=${VER_PDAF}" >> $GITHUB_OUTPUT - # fi + if [[ "${{ matrix.config.name }}" == *"PDAF"* ]]; then + VER_PDAF=$(cat model_versions | grep -w "pdaf" | cut -d' ' -f1) + echo "${VER_PDAF} => VER_PDAF" + echo "VER_PDAF=${VER_PDAF}" >> $GITHUB_OUTPUT + fi # # OASIS3-MCT @@ -396,13 +394,13 @@ jobs: pwd && git submodule update --init --force . # - # TODO - Fix PDAF GNU errors + # PDAF # - # - if: contains(matrix.config.name, 'PDAF') - # name: Update PDAF submodule ${{ steps.model-versions.outputs.VER_PDAF }} - # working-directory: ${{ env.TSMP2_ROOT }}/models/pdaf - # run: | - # pwd && git submodule update --init --force . + - if: contains(matrix.config.name, 'PDAF') + name: Update PDAF submodule ${{ steps.model-versions.outputs.VER_PDAF }} + working-directory: ${{ env.TSMP2_ROOT }}/models/pdaf + run: | + pwd && git submodule update --init --force . # # Pre-build checks