From d658b787ef66ad18245e31edbd3e0a96bc6614b7 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 13:33:16 -0400 Subject: [PATCH 01/12] Fix failing CI by building MPICH --- ...smf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml | 30 +++++++++++++++---- ...f-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 29 +++++++++++++----- 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml index e495cac08..dc763aaa3 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml @@ -14,12 +14,34 @@ jobs: compiler: [gcc-9] steps: + + - name: cache-mpich + id: cache-mpich + uses: actions/cache@v2 + with: + path: ~/mpich + key: mpich-${{ runner.os }}-3.3.2-1 + + - name: build-mpich + if: steps.cache-mpich.outputs.cache-hit != 'true' + run: | + if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then + sudo apt-get install libmpich-dev + elif [[ ${{ matrix.os }} == "macos-10.15" ]]; then + wget http://www.mpich.org/static/downloads/3.3.2/mpich-3.3.2.tar.gz &> /dev/null + tar -xzf mpich-3.3.2.tar.gz + pushd mpich-3.3.2 + ./configure --prefix=/home/runner/mpich + make + sudo make install + popd + fi - name: install-dependencies run: | + echo "/home/runner/mpich/bin" >> $GITHUB_PATH if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then sudo apt-get update sudo apt-get install doxygen - sudo apt-get install libmpich-dev sudo apt-get install libnetcdf-dev libnetcdff-dev netcdf-bin pkg-config sudo apt-get install libpng-dev sudo apt-get install libjpeg-dev @@ -34,7 +56,6 @@ jobs: sudo ln -sf /usr/local/bin/gfortran-10 /usr/local/bin/gfortran fi fi - - name: cache-esmf id: cache-esmf uses: actions/cache@v2 @@ -67,7 +88,6 @@ jobs: fi make -j2 make install - - name: cache-jasper id: cache-jasper uses: actions/cache@v2 @@ -87,7 +107,6 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper make -j2 make install - - name: checkout-nceplibs uses: actions/checkout@v2 with: @@ -127,5 +146,4 @@ jobs: mkdir build && cd build cmake .. -DCMAKE_PREFIX_PATH='~;~/jasper;~/nceplibs' -DENABLE_DOCS=On make -j2 - make test - + make test \ No newline at end of file diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index 274ef8d23..1cf3b1e18 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -14,12 +14,32 @@ jobs: compiler: [gcc-9] steps: + - name: cache-mpich + id: cache-mpich + uses: actions/cache@v2 + with: + path: ~/mpich + key: mpich-${{ runner.os }}-3.3.2-1 + + - name: build-mpich + if: steps.cache-mpich.outputs.cache-hit != 'true' + run: | + if [[ ${{ matrix.os }} == "macos-10.15" ]]; then + wget http://www.mpich.org/static/downloads/3.3.2/mpich-3.3.2.tar.gz &> /dev/null + tar -xzf mpich-3.3.2.tar.gz + pushd mpich-3.3.2 + ./configure --prefix=$HOME/mpich + make + sudo make install + popd + fi - name: install-dependencies run: | + echo "/home/runner/mpich/bin" >> $GITHUB_PATH if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then sudo apt-get update - sudo apt-get install doxygen sudo apt-get install libmpich-dev + sudo apt-get install doxygen sudo apt-get install libnetcdf-dev libnetcdff-dev netcdf-bin pkg-config sudo apt-get install libpng-dev sudo apt-get install libjpeg-dev @@ -34,9 +54,7 @@ jobs: sudo ln -sf /usr/local/bin/gfortran-10 /usr/local/bin/gfortran fi fi - export PATH="~/.local/bin:$PATH" python3 -m pip install gcovr - - name: cache-esmf id: cache-esmf uses: actions/cache@v2 @@ -69,7 +87,6 @@ jobs: fi make -j2 make install - - name: cache-jasper id: cache-jasper uses: actions/cache@v2 @@ -89,7 +106,6 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper make -j2 make install - - name: checkout-nceplibs uses: actions/checkout@v2 with: @@ -133,9 +149,8 @@ jobs: make test export PATH="/home/runner/.local/bin:$PATH" gcovr -r .. --html -o test-coverage.html - - uses: actions/upload-artifact@v2 if: ${{ matrix.os == 'ubuntu-20.04' }} with: name: test-coverage - path: ufs_utils/build/test-coverage.html + path: ufs_utils/build/test-coverage.html \ No newline at end of file From b39965b4933dc3294f717c54e9f169c129068199 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 13:51:50 -0400 Subject: [PATCH 02/12] Fix path --- .../workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index 1cf3b1e18..013139b78 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -35,7 +35,6 @@ jobs: fi - name: install-dependencies run: | - echo "/home/runner/mpich/bin" >> $GITHUB_PATH if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then sudo apt-get update sudo apt-get install libmpich-dev @@ -44,6 +43,7 @@ jobs: sudo apt-get install libpng-dev sudo apt-get install libjpeg-dev elif [[ ${{ matrix.os }} == "macos-10.15" ]]; then + echo "$HOME/mpich/bin" >> $GITHUB_PATH brew install doxygen brew install mpich brew install netcdf @@ -148,7 +148,7 @@ jobs: make -j2 make test export PATH="/home/runner/.local/bin:$PATH" - gcovr -r .. --html -o test-coverage.html + gcovr -r .. --html-details -o test-coverage.html - uses: actions/upload-artifact@v2 if: ${{ matrix.os == 'ubuntu-20.04' }} with: From 977672a0010137a75a35825f27ec096c54c7ddef Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 13:55:25 -0400 Subject: [PATCH 03/12] Fix 1.3.0 yaml --- .../esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml index dc763aaa3..1eb42701c 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml @@ -25,22 +25,21 @@ jobs: - name: build-mpich if: steps.cache-mpich.outputs.cache-hit != 'true' run: | - if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then - sudo apt-get install libmpich-dev - elif [[ ${{ matrix.os }} == "macos-10.15" ]]; then + if [[ ${{ matrix.os }} == "macos-10.15" ]]; then wget http://www.mpich.org/static/downloads/3.3.2/mpich-3.3.2.tar.gz &> /dev/null tar -xzf mpich-3.3.2.tar.gz pushd mpich-3.3.2 - ./configure --prefix=/home/runner/mpich + ./configure --prefix=$HOME/mpich make sudo make install popd fi - name: install-dependencies run: | - echo "/home/runner/mpich/bin" >> $GITHUB_PATH + echo "$HOME/mpich/bin" >> $GITHUB_PATH if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then sudo apt-get update + sudo apt-get install libmpich-dev sudo apt-get install doxygen sudo apt-get install libnetcdf-dev libnetcdff-dev netcdf-bin pkg-config sudo apt-get install libpng-dev From c12d3cdce17b3ccbadc5472d2d1521bde1b9acff Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:09:32 -0400 Subject: [PATCH 04/12] Commit --- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml | 2 +- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml index 1eb42701c..0ae2eb93c 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml @@ -145,4 +145,4 @@ jobs: mkdir build && cd build cmake .. -DCMAKE_PREFIX_PATH='~;~/jasper;~/nceplibs' -DENABLE_DOCS=On make -j2 - make test \ No newline at end of file + make test diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index 013139b78..2d2ab9ac1 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -153,4 +153,4 @@ jobs: if: ${{ matrix.os == 'ubuntu-20.04' }} with: name: test-coverage - path: ufs_utils/build/test-coverage.html \ No newline at end of file + path: ufs_utils/build/test-coverage.html From dcfae59fa0628c4aa0c081dc55db1635a4d54ab4 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:10:43 -0400 Subject: [PATCH 05/12] Revert gcovr --- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index 2d2ab9ac1..151c02eb6 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -148,7 +148,7 @@ jobs: make -j2 make test export PATH="/home/runner/.local/bin:$PATH" - gcovr -r .. --html-details -o test-coverage.html + gcovr -r .. --html -o test-coverage.html - uses: actions/upload-artifact@v2 if: ${{ matrix.os == 'ubuntu-20.04' }} with: From c2577d3bbef9ba12e5131aea48b8766b555f93de Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:12:42 -0400 Subject: [PATCH 06/12] Fix formatting --- .../workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index 151c02eb6..a4af4d334 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -33,6 +33,7 @@ jobs: sudo make install popd fi + - name: install-dependencies run: | if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then @@ -55,6 +56,7 @@ jobs: fi fi python3 -m pip install gcovr + - name: cache-esmf id: cache-esmf uses: actions/cache@v2 @@ -87,6 +89,7 @@ jobs: fi make -j2 make install + - name: cache-jasper id: cache-jasper uses: actions/cache@v2 @@ -106,6 +109,7 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper make -j2 make install + - name: checkout-nceplibs uses: actions/checkout@v2 with: From 8ae4dae1bb70451bbd5c0ecb0dd1457e479948e6 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:13:18 -0400 Subject: [PATCH 07/12] Formatting --- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index a4af4d334..504a8afff 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -109,7 +109,7 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper make -j2 make install - + - name: checkout-nceplibs uses: actions/checkout@v2 with: From 0d1c688d6c46a6f726de0014eec8a64b1c81365f Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:13:43 -0400 Subject: [PATCH 08/12] Whitespace --- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index 504a8afff..cb5fab959 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -109,7 +109,7 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper make -j2 make install - + - name: checkout-nceplibs uses: actions/checkout@v2 with: From a9726a055c692898cce13ee67d48ad6432952693 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:14:12 -0400 Subject: [PATCH 09/12] More formatting --- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index cb5fab959..15ad611dc 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -153,6 +153,7 @@ jobs: make test export PATH="/home/runner/.local/bin:$PATH" gcovr -r .. --html -o test-coverage.html + - uses: actions/upload-artifact@v2 if: ${{ matrix.os == 'ubuntu-20.04' }} with: From 89f63be3187207ee4c9b27f444f79e05da2b09c1 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:14:48 -0400 Subject: [PATCH 10/12] Formatting --- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml index 0ae2eb93c..98a89ee81 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml @@ -34,6 +34,7 @@ jobs: sudo make install popd fi + - name: install-dependencies run: | echo "$HOME/mpich/bin" >> $GITHUB_PATH @@ -55,6 +56,7 @@ jobs: sudo ln -sf /usr/local/bin/gfortran-10 /usr/local/bin/gfortran fi fi + - name: cache-esmf id: cache-esmf uses: actions/cache@v2 @@ -87,6 +89,7 @@ jobs: fi make -j2 make install + - name: cache-jasper id: cache-jasper uses: actions/cache@v2 @@ -106,6 +109,7 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper make -j2 make install + - name: checkout-nceplibs uses: actions/checkout@v2 with: From 11eaf0de35752effbef39bb066cd6b5dd7f17019 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:15:46 -0400 Subject: [PATCH 11/12] Formatting --- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml | 2 +- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml index 98a89ee81..3cd10f0c2 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml @@ -109,7 +109,7 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper make -j2 make install - + - name: checkout-nceplibs uses: actions/checkout@v2 with: diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index 15ad611dc..8ba873c24 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -153,7 +153,7 @@ jobs: make test export PATH="/home/runner/.local/bin:$PATH" gcovr -r .. --html -o test-coverage.html - + - uses: actions/upload-artifact@v2 if: ${{ matrix.os == 'ubuntu-20.04' }} with: From 525c5ec9dbeec9cbac104d31f5200e94fef8f0ad Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Mon, 22 Mar 2021 15:16:15 -0400 Subject: [PATCH 12/12] Formatting --- .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml index 3cd10f0c2..2b0b5e788 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml @@ -109,7 +109,7 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper make -j2 make install - + - name: checkout-nceplibs uses: actions/checkout@v2 with: