Skip to content

Commit acbccb8

Browse files
Merge pull request #606 from NOAA-EMC/Hang-Lei-NOAA-patch-3
Improve the developer workflow. Prepare for release of 2.3.0
2 parents 76dcf08 + 094f1d2 commit acbccb8

File tree

2 files changed

+63
-10
lines changed

2 files changed

+63
-10
lines changed

.github/workflows/developer.yml

Lines changed: 62 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
sudo apt-get install doxygen
4242
4343
- name: install-memory-dependencies
44-
if: matrix.config == 'memory'
44+
if: matrix.config == 'memcheck'
4545
run: |
4646
sudo apt-get install valgrind
4747
@@ -73,7 +73,17 @@ jobs:
7373
run: |
7474
set -x
7575
export CC=gcc
76-
cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror -g -O0 -fsanitize=address -fno-omit-frame-pointer"
76+
cmake -S g2c -B g2c/build \
77+
-DUSE_AEC=ON \
78+
-DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper \
79+
-DBUILD_G2C=ON \
80+
-DLOGGING=On \
81+
-DPTHREADS=ON \
82+
-DFTP_TEST_FILES=ON \
83+
-DFTP_LARGE_TEST_FILES=OFF \
84+
-DTEST_FILE_DIR=/home/runner/data \
85+
-DCMAKE_BUILD_TYPE=Debug \
86+
-DCMAKE_C_FLAGS="-g"
7787
cmake --build g2c/build --parallel 2 --verbose
7888
ctest --test-dir g2c/build --verbose --output-on-failure --rerun-failed
7989
@@ -82,15 +92,35 @@ jobs:
8292
run: |
8393
set -x
8494
export CC=gcc
85-
cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Werror"
95+
cmake -S g2c -B g2c/build \
96+
-DUSE_AEC=ON \
97+
-DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper \
98+
-DBUILD_G2C=ON \
99+
-DLOGGING=On \
100+
-DPTHREADS=ON \
101+
-DFTP_TEST_FILES=ON \
102+
-DFTP_LARGE_TEST_FILES=OFF \
103+
-DTEST_FILE_DIR=/home/runner/data \
104+
-DCMAKE_BUILD_TYPE=Debug \
105+
-DCMAKE_C_FLAGS="-g"
86106
cmake --build g2c/build --verbose
87107
88108
- name: code_coverage
89109
if: matrix.config == 'code coverage'
90110
run: |
91111
set -x
92112
export CC=gcc
93-
cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -fprofile-abs-path -O0"
113+
cmake -S g2c -B g2c/build \
114+
-DUSE_AEC=ON \
115+
-DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper \
116+
-DBUILD_G2C=ON \
117+
-DLOGGING=On \
118+
-DPTHREADS=ON \
119+
-DFTP_TEST_FILES=ON \
120+
-DFTP_LARGE_TEST_FILES=OFF \
121+
-DTEST_FILE_DIR=/home/runner/data \
122+
-DCMAKE_BUILD_TYPE=Debug \
123+
-DCMAKE_C_FLAGS="-g"
94124
pwd
95125
cd g2c/build
96126
make VERBOSE=1
@@ -105,7 +135,16 @@ jobs:
105135
run: |
106136
set -x
107137
export LD_LIBRARY_PATH="/home/runner/jasper/lib:$LD_LIBRARY_PATH"
108-
cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-g"
138+
cmake -S g2c -B g2c/build \
139+
-DUSE_AEC=ON \
140+
-DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper \
141+
-DBUILD_G2C=ON \
142+
-DLOGGING=On \
143+
-DPTHREADS=ON \
144+
-DFTP_TEST_FILES=ON \
145+
-DTEST_FILE_DIR=/home/runner/data \
146+
-DCMAKE_BUILD_TYPE=Debug \
147+
-DCMAKE_C_FLAGS="-g"
109148
cmake --build g2c/build --parallel 2 --verbose
110149
ctest --test-dir g2c/build
111150
ls -l g2c/build
@@ -115,7 +154,13 @@ jobs:
115154
run: |
116155
set -x
117156
export LD_LIBRARY_PATH="/home/runner/jasper/lib:$LD_LIBRARY_PATH"
118-
cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DENABLE_DOCS=On -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-g"
157+
cmake -S g2c -B g2c/build \
158+
-DUSE_AEC=ON \
159+
-DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper \
160+
-DBUILD_G2C=ON \
161+
-DENABLE_DOCS=On \
162+
-DCMAKE_BUILD_TYPE=Debug \
163+
-DCMAKE_C_FLAGS="-g"
119164
cmake --build g2c/build --parallel 2 --verbose
120165
ls -l g2c/build/docs/html
121166
@@ -127,11 +172,19 @@ jobs:
127172
clang-format --version
128173
find . -name '*.[ch]'|xargs clang-format -Werror --verbose --dry-run
129174
130-
- name: cache-data
175+
- name: populate-data
131176
if: steps.cache-data.outputs.cache-hit != 'true'
132177
run: |
133-
mkdir ~/data
134-
cp $GITHUB_WORKSPACE/g2c/build/tests/data/* ~/data
178+
# create data dir and copy test data into it.
179+
# Prefer source test data (g2c/tests/data). Fall back to build/tests/data if present.
180+
mkdir -p ~/data
181+
if [ -d "$GITHUB_WORKSPACE/g2c/tests/data" ]; then
182+
cp -r $GITHUB_WORKSPACE/g2c/tests/data/* ~/data
183+
elif [ -d "$GITHUB_WORKSPACE/g2c/build/tests/data" ]; then
184+
cp -r $GITHUB_WORKSPACE/g2c/build/tests/data/* ~/data
185+
else
186+
echo "Warning: no test data directory found at either $GITHUB_WORKSPACE/g2c/tests/data or $GITHUB_WORKSPACE/g2c/build/tests/data"
187+
fi
135188
136189
- name: upload-test-coverage
137190
if: matrix.config == 'code coverage'

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0
1+
2.3.0

0 commit comments

Comments
 (0)