From 451a39fb205e71caaeb3c29c943e3597b85c095b Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:57:03 -0700 Subject: [PATCH 1/7] Update developer.yml --- .github/workflows/developer.yml | 62 ++++----------------------------- 1 file changed, 7 insertions(+), 55 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index fa9dd0d..f48adf5 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -35,60 +35,12 @@ jobs: sudo apt-get install libnetcdf-dev libnetcdff-dev netcdf-bin pkg-config libopenblas-dev sudo apt-get install libpng-dev autotools-dev libaec-dev autoconf gcovr doxygen - - name: cache-jasper - id: cache-jasper - uses: actions/cache@v4 - with: - path: ~/jasper - key: jasper-${{ runner.os }}-4.0.0 - - - name: checkout-jasper - if: steps.cache-jasper.outputs.cache-hit != 'true' - uses: actions/checkout@v4 - with: - repository: jasper-software/jasper - path: jasper - ref: version-4.0.0 - - - name: build-jasper - if: steps.cache-jasper.outputs.cache-hit != 'true' - run: | - cd jasper - cmake -B build_dir -DCMAKE_INSTALL_PREFIX=~/jasper - cmake --build build_dir - cmake --install build_dir - - - name: checkout-ip - uses: actions/checkout@v4 + - name: "Build dependencies" + uses: NOAA-EMC/ci-build-nceplibs@develop with: - repository: NOAA-EMC/NCEPLIBS-ip - path: ip - ref: develop - - - name: build-ip - run: | - cd ip - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~ - make -j2 - make install - - - name: checkout-g2c - uses: actions/checkout@v4 - 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 + jasper-version: version-4.0.0 + ip-version: develop + g2c-version: develop - name: checkout uses: actions/checkout@v4 @@ -107,10 +59,10 @@ jobs: cd wgrib2 mkdir build cd build - export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0 -I/home/runner/g2c/include' + export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0 -I$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c/include' export FCFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' export FFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' - cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="~/ip;~/jasper;~/g2c" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON + cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip;$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON make VERBOSE=1 ctest --verbose --output-on-failure --rerun-failed gcovr --root .. -v --html-details --exclude ../tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null From 21c53f00d7613b06019276842de88ab0f4b993e2 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:04:37 -0700 Subject: [PATCH 2/7] fixing error with '$' in -I flag --- .github/workflows/developer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index f48adf5..ad829b8 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -59,7 +59,7 @@ jobs: cd wgrib2 mkdir build cd build - export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0 -I$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c/include' + export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0 -I\$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c/include' export FCFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' export FFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip;$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON From b908375eeccbda6eab51513b2776c5355eea3f7f Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:21:33 -0700 Subject: [PATCH 3/7] update include path --- .github/workflows/developer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index ad829b8..d01efe3 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -59,7 +59,7 @@ jobs: cd wgrib2 mkdir build cd build - export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0 -I\$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c/include' + export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0 -I/home/runner/work/wgrib2/wgrib2/nceplibs/NCEPLIBS-g2c/include' export FCFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' export FFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip;$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON From 1275af8203fd6505174ae3fae4bed7a1388f9c24 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:39:15 -0700 Subject: [PATCH 4/7] update ld_library_path --- .github/workflows/developer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index d01efe3..6929860 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -21,7 +21,7 @@ jobs: env: FC: gfortran CC: gcc - LD_LIBRARY_PATH: "/home/runner/jasper/lib/" + LD_LIBRARY_PATH: "/home/runner/work/wgrib2/wgrib2/nceplibs/jasper/lib/" permissions: id-token: write From 2a99e8ec564dbeba356ada492eb96c15f9289d4e Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:43:29 -0700 Subject: [PATCH 5/7] Update Linux_options.yml --- .github/workflows/Linux_options.yml | 51 +++-------------------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/.github/workflows/Linux_options.yml b/.github/workflows/Linux_options.yml index 853f803..0ad71f1 100644 --- a/.github/workflows/Linux_options.yml +++ b/.github/workflows/Linux_options.yml @@ -57,53 +57,10 @@ jobs: echo "CC=gcc-${{ matrix.gcc-version }}" >> $GITHUB_ENV echo "FC=gfortran-${{ matrix.gcc-version }}" >> $GITHUB_ENV - - name: cache-jasper - id: cache-jasper - uses: actions/cache@v3 + - name: "Build dependencies" + uses: NOAA-EMC/ci-build-nceplibs@develop with: - path: ~/jasper - key: jasper-${{ runner.os }}-gcc${{ matrix.gcc-version }}-1.900.1 - - - name: checkout-jasper - if: steps.cache-jasper.outputs.cache-hit != 'true' - uses: actions/checkout@v2 - with: - repository: jasper-software/jasper - path: jasper - ref: version-1.900.1 - - - name: build-jasper - if: steps.cache-jasper.outputs.cache-hit != 'true' - run: | - cd jasper - CFLAGS="-Wno-implicit-function-declaration -Wno-incompatible-pointer-types" ./configure --prefix=$HOME/jasper - make - make install - - - name: cache-ip - id: cache-ip - uses: actions/cache@v3 - with: - path: ~/ip - key: ip-${{ runner.os }}-gcc${{ matrix.gcc-version }}-develop - - - name: checkout-ip - if: steps.cache-ip.outputs.cache-hit != 'true' - uses: actions/checkout@v3 - with: - repository: NOAA-EMC/NCEPLIBS-ip - path: ip - ref: develop - - - 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 + ip-version: develop - name: checkout uses: actions/checkout@v2 @@ -115,6 +72,6 @@ jobs: cd wgrib2 mkdir b cd b - cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="~/ip" .. + cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip" .. make VERBOSE=1 ctest --verbose --output-on-failure --rerun-failed From f1071e5d160074cd81b72d05ce6ce707ef6823ab Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:34:17 -0800 Subject: [PATCH 6/7] Update Linux_options.yml --- .github/workflows/Linux_options.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/Linux_options.yml b/.github/workflows/Linux_options.yml index 6208b35..009067e 100644 --- a/.github/workflows/Linux_options.yml +++ b/.github/workflows/Linux_options.yml @@ -61,22 +61,8 @@ jobs: uses: NOAA-EMC/ci-build-nceplibs@develop with: ip-version: develop - - - name: checkout-g2c - uses: actions/checkout@v4 - 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 -DUSE_OpenJPEG=ON -DUSE_Jasper=OFF - make -j2 - make install + g2c-version: develop + g2c-cmake-args: -DUSE_OpenJPEG=ON -DUSE_Jasper=OFF - name: checkout uses: actions/checkout@v2 From dbee0aa655f74ebca102c2920d48ebfc935c10b9 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:44:20 -0800 Subject: [PATCH 7/7] update g2c include path --- .github/workflows/Linux_options.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux_options.yml b/.github/workflows/Linux_options.yml index 009067e..a8a64bd 100644 --- a/.github/workflows/Linux_options.yml +++ b/.github/workflows/Linux_options.yml @@ -74,7 +74,7 @@ jobs: cd wgrib2 mkdir b cd b - export CFLAGS='-I/home/runner/g2c/include' + export CFLAGS='-I/home/runner/work/wgrib2/wgrib2/nceplibs/NCEPLIBS-g2c/include' cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c" .. make VERBOSE=1