From e81fe5d3f3b34dafd65b5cef0dcdb1a8aef8c2ce Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 30 Dec 2022 05:00:23 -0700 Subject: [PATCH 01/20] now testing with g2c_compare utility --- CMakeLists.txt | 10 ++++++++++ tests/CMakeLists.txt | 7 ++++++- tests/run_copygb2_tests.sh | 7 +++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d3e9d26..2728a439 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,16 @@ find_package(w3emc 2.9.2 REQUIRED) find_package(g2 3.4.0 REQUIRED) if (g2_VERSION GREATER_EQUAL 3.5.0) find_package(g2c 1.7.0 REQUIRED) +else() + find_package(g2c 1.7.0) +endif() + +# See if the g2c_compare program is available. +find_program(G2C_COMPARE g2c_compare) +if (G2C_COMPARE) + message(STATUS "g2c_compare found: ${G2C_COMPARE}") +else() + message(STATUS "g2c_compare not found.") endif() # The name of the bacio library changed with the 2.5.0 release. The diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8bc75289..0f3363e5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -71,11 +71,16 @@ gu_copy_test_data(ref_gdaswave.t00z.wcoast.0p16.f000_2.grib2.idx) # Run these shell tests. gu_test(run_cnvgrib_tests) gu_test(run_copygb_tests) -gu_test(run_copygb2_tests) gu_test(run_degrib2_tests) gu_test(run_grbindex_tests) gu_test(run_grb2index_tests) +# This test depends on the g2c_compare utility, which may not be +# present. +if (G2C_COMPARE) + gu_test(run_copygb2_tests) +endif() + # Does the user want to get extra test files from the FTP site, and # run extra tests on them? if(FTP_TEST_FILES) diff --git a/tests/run_copygb2_tests.sh b/tests/run_copygb2_tests.sh index b15635a2..4bc79e9c 100755 --- a/tests/run_copygb2_tests.sh +++ b/tests/run_copygb2_tests.sh @@ -10,12 +10,15 @@ echo "*** Running copygb2 test" # Copy GRIB2 file. ../src/copygb2/copygb2 -x data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 +# Are the files the same? +g2c_compare -v data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 + # Create an index of the copied file. -../src/grb2index/grb2index test_gdaswave_2.grib2 test_gdaswave_2.idx +#../src/grb2index/grb2index test_gdaswave_2.grib2 test_gdaswave_2.idx # Check against expected output. First 120 bytes contain differences, # so ignore them. -cmp -i 120 test_gdaswave_2.idx data/ref_gdaswave_2.idx +#cmp -i 120 test_gdaswave_2.idx data/ref_gdaswave_2.idx echo "*** SUCCESS!" exit 0 From b2acec9b3edf890fbe748f4211134f6959986f21 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Sat, 31 Dec 2022 09:17:27 -0700 Subject: [PATCH 02/20] chanign CI --- .github/workflows/Linux_versions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index e4358957..36666f5c 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -21,8 +21,8 @@ jobs: matrix: g2-version: [3.4.5, 3.4.x] bacio-version: [2.4.1, 2.5.0] - jasper-version: [2.0.33] - w3emc-version: [2.9.2, 2.9.3] + jasper-version: [4.0.0] + w3emc-version: [2.9.3] steps: - name: install-dependencies From a405c7123ea7abf3d4e35341746f9764fb073351 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Sat, 31 Dec 2022 09:23:48 -0700 Subject: [PATCH 03/20] CI --- .github/workflows/Linux_versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index 36666f5c..8ab60a8c 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -21,7 +21,7 @@ jobs: matrix: g2-version: [3.4.5, 3.4.x] bacio-version: [2.4.1, 2.5.0] - jasper-version: [4.0.0] + jasper-version: [2.0.33] w3emc-version: [2.9.3] steps: From 480eb801366404f6e69c0d01d0f5470a2649d73e Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Sat, 31 Dec 2022 09:32:14 -0700 Subject: [PATCH 04/20] CI --- .github/workflows/developer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 629ae9d4..129852c4 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -160,6 +160,7 @@ jobs: mkdir build && cd build ls -l ~/jasper/lib export LD_LIBRARY_PATH=/home/runner/jasper/lib + export PATH="/home/runner/g2c/bin/g2c_compare:$PATH" cmake -DENABLE_DOCS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2;~/g2c" -DCMAKE_Fortran_FLAGS="-fprofile-arcs -ftest-coverage -O0 -Wall" -DCMAKE_C_FLAGS="-fprofile-arcs -ftest-coverage -O0 -Wall" .. make -j2 VERBOSE=1 ctest --output-on-failure --rerun-failed --verbose From 8d809e4cf6b4568c55fb897f3fb4a79fcc989c73 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 9 Jan 2023 07:52:20 +0100 Subject: [PATCH 05/20] changed version of sp in developer CI workflow --- .github/workflows/developer.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 129852c4..c0a65000 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -1,15 +1,18 @@ +# This is a GitHub actions CI workflow for the NCEPLIBS-grib_util +# project. +# +# This workflow tests the build as a developer would do it, with +# address sanitizer and documentation build. +# +# Ed Hartnett 1/9/23 name: developer on: push: branches: - develop - paths-ignore: - - README.md pull_request: branches: - develop - paths-ignore: - - README.md jobs: developer: @@ -67,14 +70,23 @@ jobs: make -j2 make install + - name: cache-sp + id: cache-sp + uses: actions/cache@v2 + with: + path: ~/sp + key: sp-developer-${{ runner.os }}-2.3.3 + - name: checkout-sp + if: steps.cache-sp.outputs.cache-hit != 'true' uses: actions/checkout@v2 with: repository: NOAA-EMC/NCEPLIBS-sp path: sp - ref: develop + ref: v2.3.3 - name: build-sp + if: steps.cache-sp.outputs.cache-hit != 'true' run: | cd sp mkdir build From 5df79d3c5386f3ef7c233c7939e3123dedf108ce Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 19 Jan 2023 07:58:34 +0100 Subject: [PATCH 06/20] CI cleanup --- .github/workflows/Intel.yml | 10 +++++----- .github/workflows/Linux_versions.yml | 10 ++++++---- .github/workflows/MacOS.yml | 9 +++++---- .github/workflows/developer.yml | 10 ++++++---- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.github/workflows/Intel.yml b/.github/workflows/Intel.yml index 0e303c9d..6c3495e6 100644 --- a/.github/workflows/Intel.yml +++ b/.github/workflows/Intel.yml @@ -1,16 +1,16 @@ +# This is a GitHub actions workflow for the NCEPLIBS-grib_util project. +# +# This workflow builds with the intel compiler. +# +# Ed Hartnett 1/19/23 name: Intel on: push: branches: - develop - paths-ignore: - - README.md pull_request: branches: - develop - paths-ignore: - - README.md - # Use custom shell with -l so .bash_profile is sourced which loads intel/oneapi/setvars.sh # without having to do it in manually every step diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index e4358957..ac4e35b8 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -1,15 +1,17 @@ +# This is a GitHub actions workflow for the NCEPLIBS-grib_util project. +# +# This workflow builds on Linux with different versions of dependent +# packages. +# +# Ed Hartnett 1/19/23 name: Linux_versions on: push: branches: - develop - paths-ignore: - - README.md pull_request: branches: - develop - paths-ignore: - - README.md jobs: Linux_versions: diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index 0de66dd1..8938eb60 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -1,15 +1,16 @@ +# This is a GitHub actions workflow for the NCEPLIBS-grib_util project. +# +# This workflow builds on MacOS. +# +# Ed Hartnett 1/19/23 name: MacOS on: push: branches: - develop - paths-ignore: - - README.md pull_request: branches: - develop - paths-ignore: - - README.md jobs: MacOS: diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 629ae9d4..5ba73b6c 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -1,15 +1,17 @@ +# This is a GitHub actions workflow for the NCEPLIBS-grib_util project. +# +# This workflow does the developer run, with documentation build and +# code coverage. +# +# Ed Hartnett 1/19/23 name: developer on: push: branches: - develop - paths-ignore: - - README.md pull_request: branches: - develop - paths-ignore: - - README.md jobs: developer: From 54f5064e0c3ef2aca59d1477c88474fb303ffc28 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 10:42:26 +0100 Subject: [PATCH 07/20] getting tests to pass --- tests/run_copygb2_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run_copygb2_tests.sh b/tests/run_copygb2_tests.sh index 4bc79e9c..3cf8bea0 100755 --- a/tests/run_copygb2_tests.sh +++ b/tests/run_copygb2_tests.sh @@ -11,7 +11,7 @@ echo "*** Running copygb2 test" ../src/copygb2/copygb2 -x data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 # Are the files the same? -g2c_compare -v data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 +#g2c_compare -v data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 # Create an index of the copied file. #../src/grb2index/grb2index test_gdaswave_2.grib2 test_gdaswave_2.idx From 955c381b91c295ea600e9411c03f933d95d72cfa Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 14:11:53 +0100 Subject: [PATCH 08/20] trying to fix CI --- .github/workflows/developer.yml | 2 +- tests/run_copygb2_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index c0a65000..53faad75 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -172,7 +172,7 @@ jobs: mkdir build && cd build ls -l ~/jasper/lib export LD_LIBRARY_PATH=/home/runner/jasper/lib - export PATH="/home/runner/g2c/bin/g2c_compare:$PATH" + export PATH="~/g2c/bin:$PATH" cmake -DENABLE_DOCS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2;~/g2c" -DCMAKE_Fortran_FLAGS="-fprofile-arcs -ftest-coverage -O0 -Wall" -DCMAKE_C_FLAGS="-fprofile-arcs -ftest-coverage -O0 -Wall" .. make -j2 VERBOSE=1 ctest --output-on-failure --rerun-failed --verbose diff --git a/tests/run_copygb2_tests.sh b/tests/run_copygb2_tests.sh index 3cf8bea0..4bc79e9c 100755 --- a/tests/run_copygb2_tests.sh +++ b/tests/run_copygb2_tests.sh @@ -11,7 +11,7 @@ echo "*** Running copygb2 test" ../src/copygb2/copygb2 -x data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 # Are the files the same? -#g2c_compare -v data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 +g2c_compare -v data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 # Create an index of the copied file. #../src/grb2index/grb2index test_gdaswave_2.grib2 test_gdaswave_2.idx From a0f05cb32f9eaea998af082c7e6758b08f114f1b Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 14:17:12 +0100 Subject: [PATCH 09/20] trying to fix CI --- tests/run_copygb2_tests.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/run_copygb2_tests.sh b/tests/run_copygb2_tests.sh index 4bc79e9c..b94397d8 100755 --- a/tests/run_copygb2_tests.sh +++ b/tests/run_copygb2_tests.sh @@ -13,12 +13,5 @@ echo "*** Running copygb2 test" # Are the files the same? g2c_compare -v data/ref_gdaswave.t00z.wcoast.0p16.f000.grib2 test_gdaswave_2.grib2 -# Create an index of the copied file. -#../src/grb2index/grb2index test_gdaswave_2.grib2 test_gdaswave_2.idx - -# Check against expected output. First 120 bytes contain differences, -# so ignore them. -#cmp -i 120 test_gdaswave_2.idx data/ref_gdaswave_2.idx - echo "*** SUCCESS!" exit 0 From 5dff7012b567076e369a8d3ee30bb7eef84c8ec7 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 14:21:04 +0100 Subject: [PATCH 10/20] more jasper versions --- .github/workflows/Linux_versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index 9ccada60..444eaeac 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -23,7 +23,7 @@ jobs: matrix: g2-version: [3.4.5, 3.4.x] bacio-version: [2.4.1, 2.5.0] - jasper-version: [2.0.33] + jasper-version: [2.0.33, 3.0.5, 4.0.0] w3emc-version: [2.9.3] steps: From b44f89487242e798a1ff8e5fb8c93af99febdbb9 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 14:23:53 +0100 Subject: [PATCH 11/20] less versions --- .github/workflows/Linux_versions.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index 444eaeac..c93e0225 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -22,8 +22,9 @@ jobs: strategy: matrix: g2-version: [3.4.5, 3.4.x] - bacio-version: [2.4.1, 2.5.0] - jasper-version: [2.0.33, 3.0.5, 4.0.0] +# bacio-version: [2.4.1, 2.5.0] + bacio-version: [2.5.0] + jasper-version: [2.0.33, 3.0.5] w3emc-version: [2.9.3] steps: From f7dfab4f4b551d0257f825db5da75966fd00cb52 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 15:45:23 +0100 Subject: [PATCH 12/20] less versions --- .github/workflows/Linux_versions.yml | 4 ++-- .github/workflows/developer.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index c93e0225..a9f465f8 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -22,9 +22,9 @@ jobs: strategy: matrix: g2-version: [3.4.5, 3.4.x] -# bacio-version: [2.4.1, 2.5.0] + bacio-version: [2.4.1, 2.5.0] bacio-version: [2.5.0] - jasper-version: [2.0.33, 3.0.5] + jasper-version: [2.0.33] w3emc-version: [2.9.3] steps: diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 53faad75..2ff72f9e 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -37,7 +37,7 @@ jobs: with: repository: jasper-software/jasper path: jasper - ref: version-2.0.33 + ref: version-3.0.5 - name: cache-jasper id: cache-jasper From ce5c6fd11da36fb38ed10ea6bbeb3f511898f988 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 15:51:04 +0100 Subject: [PATCH 13/20] another workflow --- .github/workflows/Linux_external.yml | 194 +++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 .github/workflows/Linux_external.yml diff --git a/.github/workflows/Linux_external.yml b/.github/workflows/Linux_external.yml new file mode 100644 index 00000000..c46d64ff --- /dev/null +++ b/.github/workflows/Linux_external.yml @@ -0,0 +1,194 @@ +# This is a GitHub actions workflow for the NCEPLIBS-grib_util project. +# +# This workflow builds on Linux with latest versions of NCEPLIBS and +# different versions jasper. +# +# Ed Hartnett 1/19/23 +name: Linux_versions +on: + push: + branches: + - develop + pull_request: + branches: + - develop + +jobs: + Linux_versions: + runs-on: ubuntu-latest + env: + FC: gfortran-11 + CC: gcc-11 + strategy: + matrix: + g2-version: [develop, 3.4.x] + bacio-version: [2.5.0] + jasper-version: [2.0.33, 3.0.5] + w3emc-version: [2.9.3] + + steps: + - name: install-dependencies + run: | + sudo apt-get update &> /dev/null + sudo apt-get install libpng-dev libjpeg-dev + + - name: cache-jasper + id: cache-jasper + uses: actions/cache@v2 + with: + path: ~/jasper + key: jasper-Linux_versions-${{ matrix.jasper-version }} + + - name: checkout-jasper + if: steps.cache-jasper.outputs.cache-hit != 'true' + uses: actions/checkout@v2 + with: + repository: jasper-software/jasper + path: jasper + ref: version-${{ matrix.jasper-version }} + + - name: build-jasper + if: steps.cache-jasper.outputs.cache-hit != 'true' + run: | + cd jasper + mkdir b && cd b + cmake .. -DCMAKE_INSTALL_PREFIX=~/jasper + make -j2 + make install + + - name: cache-bacio + id: cache-bacio + uses: actions/cache@v2 + with: + path: ~/bacio + key: bacio-${{ runner.os }}-v${{ matrix.bacio-version }} + + - name: checkout-bacio + if: steps.cache-bacio.outputs.cache-hit != 'true' + uses: actions/checkout@v2 + with: + repository: NOAA-EMC/NCEPLIBS-bacio + path: bacio + ref: v${{ matrix.bacio-version }} + + - name: build-bacio + if: steps.cache-bacio.outputs.cache-hit != 'true' + run: | + cd bacio + mkdir build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=~/bacio + make -j2 + make install + + - name: cache-sp + id: cache-sp + uses: actions/cache@v2 + with: + path: ~/sp + key: sp-${{ runner.os }}-2.3.3-1 + + - name: checkout-sp + if: steps.cache-sp.outputs.cache-hit != 'true' + uses: actions/checkout@v2 + with: + repository: NOAA-EMC/NCEPLIBS-sp + path: sp + ref: v2.3.3 + + - name: build-sp + if: steps.cache-sp.outputs.cache-hit != 'true' + run: | + cd sp + mkdir build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=~/sp + make -j2 + make install + + - name: cache-w3emc + id: cache-w3emc + uses: actions/cache@v2 + with: + path: ~/w3emc + key: w3emc-${{ runner.os }}-${{ matrix.w3emc-version }}-bacio-${{ matrix.bacio-version }} + + - name: checkout-w3emc + if: steps.cache-w3emc.outputs.cache-hit != 'true' + uses: actions/checkout@v2 + with: + repository: NOAA-EMC/NCEPLIBS-w3emc + path: w3emc + ref: v${{ matrix.w3emc-version }} + + - name: build-w3emc + if: steps.cache-w3emc.outputs.cache-hit != 'true' + run: | + cd w3emc + mkdir build + cd build + cmake .. -DCMAKE_PREFIX_PATH=~/bacio -DCMAKE_INSTALL_PREFIX=~/w3emc + make -j2 + make install + + - name: cache-ip + id: cache-ip + uses: actions/cache@v2 + with: + path: ~/ip + key: ip-${{ runner.os }}-3.3.3 + + - name: checkout-ip + if: steps.cache-ip.outputs.cache-hit != 'true' + uses: actions/checkout@v2 + with: + repository: NOAA-EMC/NCEPLIBS-ip + path: ip + ref: v3.3.3 + + - name: build-ip + if: steps.cache-ip.outputs.cache-hit != 'true' + run: | + cd ip + mkdir build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp + make -j2 + make install + + - name: cache-g2 + id: cache-g2 + uses: actions/cache@v2 + with: + path: ~/g2 + key: g2-${{ runner.os }}-${{ matrix.bacio-version }}-${{ matrix.jasper-version }}-${{ matrix.w3emc-version }}-${{ matrix.g2-version }} + + - name: checkout-g2 + if: steps.cache-g2.outputs.cache-hit != 'true' + uses: actions/checkout@v2 + with: + repository: NOAA-EMC/NCEPLIBS-g2 + path: g2 + ref: v${{ matrix.g2-version }} + + - name: build-g2 + if: steps.cache-g2.outputs.cache-hit != 'true' + run: | + cd g2 + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=~/g2 -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/w3emc" .. + make -j2 + make install + + - name: checkout-grib_utils + uses: actions/checkout@v2 + with: + path: grib_utils + + - name: build-grib_utils + run: | + cd grib_utils + mkdir build && cd build + cmake -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2" .. + make -j2 VERBOSE=1 + ctest --output-on-failure --rerun-failed --verbose From 9c7a9b7822b6f53a16a09e2415cc17fb50366dc2 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 15:55:18 +0100 Subject: [PATCH 14/20] another workflow --- .github/workflows/Linux_external.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Linux_external.yml b/.github/workflows/Linux_external.yml index c46d64ff..d46a263a 100644 --- a/.github/workflows/Linux_external.yml +++ b/.github/workflows/Linux_external.yml @@ -21,7 +21,7 @@ jobs: CC: gcc-11 strategy: matrix: - g2-version: [develop, 3.4.x] + g2-version: [develop, v3.4.x] bacio-version: [2.5.0] jasper-version: [2.0.33, 3.0.5] w3emc-version: [2.9.3] @@ -155,23 +155,15 @@ jobs: make -j2 make install - - name: cache-g2 - id: cache-g2 - uses: actions/cache@v2 - with: - path: ~/g2 - key: g2-${{ runner.os }}-${{ matrix.bacio-version }}-${{ matrix.jasper-version }}-${{ matrix.w3emc-version }}-${{ matrix.g2-version }} - - name: checkout-g2 if: steps.cache-g2.outputs.cache-hit != 'true' uses: actions/checkout@v2 with: repository: NOAA-EMC/NCEPLIBS-g2 path: g2 - ref: v${{ matrix.g2-version }} + ref: ${{ matrix.g2-version }} - name: build-g2 - if: steps.cache-g2.outputs.cache-hit != 'true' run: | cd g2 mkdir build From 228fd2893416d74021fca4083dc98adcbb3aee48 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 16:06:56 +0100 Subject: [PATCH 15/20] another workflow --- .github/workflows/developer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 2ff72f9e..7d943c9c 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -156,6 +156,7 @@ jobs: mkdir build cd build echo $LD_LIBRARY_PATH + export PATH="~/g2c/bin:$PATH" pwd cmake -DCMAKE_INSTALL_PREFIX=~/g2 -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/w3emc;~/g2c" .. make -j2 From 080d8c54bb7dc1c070c22438d0f0c495b71dc695 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 25 Jan 2023 16:12:15 +0100 Subject: [PATCH 16/20] another workflow --- .github/workflows/Linux_versions.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index a9f465f8..9ccada60 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -23,7 +23,6 @@ jobs: matrix: g2-version: [3.4.5, 3.4.x] bacio-version: [2.4.1, 2.5.0] - bacio-version: [2.5.0] jasper-version: [2.0.33] w3emc-version: [2.9.3] From 198a365735a4f0a70ffbd3663226a7b0fd022f22 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 26 Jan 2023 09:16:31 +0100 Subject: [PATCH 17/20] more changes to CI --- .github/workflows/Linux_external.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Linux_external.yml b/.github/workflows/Linux_external.yml index d46a263a..4ad161cb 100644 --- a/.github/workflows/Linux_external.yml +++ b/.github/workflows/Linux_external.yml @@ -4,7 +4,7 @@ # different versions jasper. # # Ed Hartnett 1/19/23 -name: Linux_versions +name: Linux_external on: push: branches: @@ -14,7 +14,7 @@ on: - develop jobs: - Linux_versions: + Linux_external: runs-on: ubuntu-latest env: FC: gfortran-11 @@ -155,6 +155,22 @@ jobs: make -j2 make install + - name: checkout-g2c + uses: actions/checkout@v2 + with: + repository: NOAA-EMC/NCEPLIBS-g2c + path: g2c + ref: develop + + - name: build-g2c + run: | + cd g2c + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=~/g2c -DCMAKE_PREFIX_PATH="~/jasper" .. + make -j2 + make install + - name: checkout-g2 if: steps.cache-g2.outputs.cache-hit != 'true' uses: actions/checkout@v2 @@ -168,7 +184,7 @@ jobs: cd g2 mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX=~/g2 -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/w3emc" .. + cmake -DCMAKE_INSTALL_PREFIX=~/g2 -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/w3emc;~/g2c" .. make -j2 make install From efdb3eba970d7601bbb5b381ed60e31a903952a5 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 26 Jan 2023 09:18:30 +0100 Subject: [PATCH 18/20] more changes to CI --- .github/workflows/Linux_external.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux_external.yml b/.github/workflows/Linux_external.yml index 4ad161cb..7b8e7881 100644 --- a/.github/workflows/Linux_external.yml +++ b/.github/workflows/Linux_external.yml @@ -197,6 +197,6 @@ jobs: run: | cd grib_utils mkdir build && cd build - cmake -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2" .. + cmake -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2;~/g2c" .. make -j2 VERBOSE=1 ctest --output-on-failure --rerun-failed --verbose From d077cfe27d2a34af0c104c32250ca2b208f25270 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 26 Jan 2023 09:20:26 +0100 Subject: [PATCH 19/20] more changes to CI --- .github/workflows/Linux_external.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Linux_external.yml b/.github/workflows/Linux_external.yml index 7b8e7881..3e618d32 100644 --- a/.github/workflows/Linux_external.yml +++ b/.github/workflows/Linux_external.yml @@ -197,6 +197,8 @@ jobs: run: | cd grib_utils mkdir build && cd build + export LD_LIBRARY_PATH=/home/runner/jasper/lib + export PATH="~/g2c/bin:$PATH" cmake -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2;~/g2c" .. make -j2 VERBOSE=1 ctest --output-on-failure --rerun-failed --verbose From 0f3f92ed87c2174aea07236ce16a4ae8c0348db9 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Thu, 26 Jan 2023 09:24:46 +0100 Subject: [PATCH 20/20] more versions --- .github/workflows/Linux_external.yml | 2 +- .github/workflows/Linux_versions.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux_external.yml b/.github/workflows/Linux_external.yml index 3e618d32..960ec74e 100644 --- a/.github/workflows/Linux_external.yml +++ b/.github/workflows/Linux_external.yml @@ -23,7 +23,7 @@ jobs: matrix: g2-version: [develop, v3.4.x] bacio-version: [2.5.0] - jasper-version: [2.0.33, 3.0.5] + jasper-version: [2.0.33, 3.0.5, 4.0.0] w3emc-version: [2.9.3] steps: diff --git a/.github/workflows/Linux_versions.yml b/.github/workflows/Linux_versions.yml index 9ccada60..ac4e35b8 100644 --- a/.github/workflows/Linux_versions.yml +++ b/.github/workflows/Linux_versions.yml @@ -24,7 +24,7 @@ jobs: g2-version: [3.4.5, 3.4.x] bacio-version: [2.4.1, 2.5.0] jasper-version: [2.0.33] - w3emc-version: [2.9.3] + w3emc-version: [2.9.2, 2.9.3] steps: - name: install-dependencies