Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down