Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'set -u' to all shell scripts #7

Merged
merged 4 commits into from
Aug 19, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'develop' into set_minus_u
  • Loading branch information
DusanJovic-NOAA committed Aug 19, 2020
commit 9c430f4ddb13aab9599ff9019c0712c4065412a7
8 changes: 1 addition & 7 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,7 @@ jobs:
prefix=$GITHUB_WORKSPACE/linux-openmpi/install
export PATH="$prefix/bin:$PATH"
export LD_LIBRARY_PATH="$prefix/lib:$LD_LIBRARY_PATH"
./build_stack.sh -p $prefix -c config/config_custom.sh -y config/stack_custom.yaml 2>&1

# - name: upload-build-linux-openmpi-log
# uses: actions/upload-artifact@v2
# with:
# name: build-linux-openmpi-log
# path: linux-openmpi/build-linux-openmpi.log
./build_stack.sh -p $prefix -c config/config_custom.sh -y config/stack_custom.yaml

# # MPICH
# name: linux-mpich
Expand Down
14 changes: 14 additions & 0 deletions config/stack_hera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,17 @@ wgrib2:
version: v2.0.8-cmake-v1.0.2
install_as: 2.0.8
openmp: OFF
spectral: OFF
ipolates: 0

prod_util:
build: YES
version: develop
install_as: develop
openmp: OFF

grib_util:
build: YES
version: develop
install_as: develop
openmp: OFF
9 changes: 3 additions & 6 deletions libs/build_nceplibs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,9 @@ case $name in
gitURL="https://github.com/noaa-emc/emc_crtm"
;;
wgrib2)
gitURL="https://github.com/noaa-emc/nceplibs-$name"
extraCMakeFlags="-DUSE_IPOLATES=0 -DUSE_SPECTRAL=OFF"
;;
*)
gitURL="https://github.com/noaa-emc/nceplibs-$name"
extraCMakeFlags=""
[[ -z ${STACK_wgrib2_ipolates:-} ]] && ipolates=0 || ipolates=$STACK_wgrib2_ipolates
[[ -z ${STACK_wgrib2_spectral:-} ]] && spectral=OFF || spectral=$STACK_wgrib2_spectral
extraCMakeFlags="-DUSE_SPECTRAL=$spectral -DUSE_IPOLATES=$ipolates"
;;
esac

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.