diff --git a/.github/workflows/build_testing.yml b/.github/workflows/build_testing.yml index 2a9364fceb..c33d7b5646 100644 --- a/.github/workflows/build_testing.yml +++ b/.github/workflows/build_testing.yml @@ -83,6 +83,15 @@ jobs: run: | sudo apt-get update sudo apt-get -qq install netcdf-bin + - name: Install nccmp + run: | + wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" + bash Miniforge3.sh -b -p "${HOME}/conda" + source "${HOME}/conda/etc/profile.d/conda.sh" + conda activate + conda install -q nccmp + path=$(which nccmp) + ln -s "$path" "${HOME}/nccmp" - name: Run Tox run: tox -e ${{ matrix.env }} working-directory: utils/python/MITgcmutils diff --git a/utils/python/MITgcmutils/tests/data b/utils/python/MITgcmutils/tests/data index 693f48825e..6a6a371d33 160000 --- a/utils/python/MITgcmutils/tests/data +++ b/utils/python/MITgcmutils/tests/data @@ -1 +1 @@ -Subproject commit 693f48825eb746716933345476159cc802cd2f9b +Subproject commit 6a6a371d335cf986c33361a6631a7e57d3f6c261 diff --git a/utils/python/MITgcmutils/tests/run-scripts b/utils/python/MITgcmutils/tests/run-scripts index 45ae165ff8..3ba3f018aa 100755 --- a/utils/python/MITgcmutils/tests/run-scripts +++ b/utils/python/MITgcmutils/tests/run-scripts @@ -22,8 +22,8 @@ for f in \ echo "Metadata doesn't match reference: $f" err=1 fi - if ! diff tests/md5/$f.md5 $o.md5; then - echo "Checksum doesn't match reference: $f" + if ! $HOME/nccmp -d -m tests/data/gluemncbig/$f.nc $o.nc; then + echo "Data doesn't match reference: $f" err=1 else rm $o.cdl $o.md5 $o.nc