Simplify env variable names

This commit is contained in:
Piotr Wójcik 2023-05-28 15:16:09 +02:00
commit 37482cf51c
2 changed files with 10 additions and 10 deletions

View file

@ -6,7 +6,7 @@ if [[ ${1:-} ]]; then
BUILD_TARGET="--target $1" BUILD_TARGET="--target $1"
fi fi
NODE_SRC=${NODE_SRC:-${PWD}} SRC=${SRC:-${PWD}}
OS=$(uname) OS=$(uname)
CMAKE_BACKTRACE="" CMAKE_BACKTRACE=""
@ -19,13 +19,13 @@ if [[ "$OS" == 'Linux' ]]; then
fi fi
CMAKE_QT_DIR="" CMAKE_QT_DIR=""
if [[ ${NANO_QT_DIR:-} ]]; then if [[ ${QT_DIR:-} ]]; then
CMAKE_QT_DIR="-DQt5_DIR=${NANO_QT_DIR}" CMAKE_QT_DIR="-DQt5_DIR=${QT_DIR}"
fi fi
CMAKE_SANITIZER="" CMAKE_SANITIZER=""
if [[ ${NANO_SANITIZER:-} ]]; then if [[ ${SANITIZER:-} ]]; then
case "${NANO_SANITIZER}" in case "${SANITIZER}" in
ASAN) ASAN)
CMAKE_SANITIZER="-DNANO_ASAN=ON" CMAKE_SANITIZER="-DNANO_ASAN=ON"
;; ;;
@ -36,7 +36,7 @@ if [[ ${NANO_SANITIZER:-} ]]; then
CMAKE_SANITIZER="-DNANO_TSAN=ON" CMAKE_SANITIZER="-DNANO_TSAN=ON"
;; ;;
*) *)
echo "Unknown sanitizer: '${NANO_SANITIZER}'" echo "Unknown sanitizer: '${SANITIZER}'"
exit 1 exit 1
;; ;;
esac esac
@ -53,11 +53,11 @@ cmake \
-DACTIVE_NETWORK=nano_${NANO_NETWORK:-"live"}_network \ -DACTIVE_NETWORK=nano_${NANO_NETWORK:-"live"}_network \
-DNANO_TEST=${NANO_TEST:-OFF} \ -DNANO_TEST=${NANO_TEST:-OFF} \
-DNANO_GUI=${NANO_GUI:-OFF} \ -DNANO_GUI=${NANO_GUI:-OFF} \
-DCOVERAGE=${NANO_COVERAGE:-OFF} \ -DCOVERAGE=${COVERAGE:-OFF} \
${CMAKE_SANITIZER:-} \ ${CMAKE_SANITIZER:-} \
${CMAKE_QT_DIR:-} \ ${CMAKE_QT_DIR:-} \
${CMAKE_BACKTRACE:-} \ ${CMAKE_BACKTRACE:-} \
${NODE_SRC} ${SRC}
number_of_processors() { number_of_processors() {
case "$(uname -s)" in case "$(uname -s)" in
@ -90,4 +90,4 @@ parallel_build_flag() {
cmake --build ${PWD} ${BUILD_TARGET} $(parallel_build_flag) cmake --build ${PWD} ${BUILD_TARGET} $(parallel_build_flag)
popd popd

View file

@ -42,4 +42,4 @@ foreach ($entry in $toDownload) {
} }
# Save install location for subsequent steps # Save install location for subsequent steps
"NANO_QT_DIR=C:\Qt\5.15.2\msvc2019_64\lib\cmake\Qt5" >> $env:GITHUB_ENV "QT_DIR=C:\Qt\5.15.2\msvc2019_64\lib\cmake\Qt5" >> $env:GITHUB_ENV