From 37482cf51c3f81a36d2286f998a0a5fc3ee316ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Sun, 28 May 2023 15:16:09 +0200 Subject: [PATCH] Simplify env variable names --- ci/build.sh | 18 +++++++++--------- ci/prepare/windows/install-qt.ps1 | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index fabfe428..a2382410 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -6,7 +6,7 @@ if [[ ${1:-} ]]; then BUILD_TARGET="--target $1" fi -NODE_SRC=${NODE_SRC:-${PWD}} +SRC=${SRC:-${PWD}} OS=$(uname) CMAKE_BACKTRACE="" @@ -19,13 +19,13 @@ if [[ "$OS" == 'Linux' ]]; then fi CMAKE_QT_DIR="" -if [[ ${NANO_QT_DIR:-} ]]; then - CMAKE_QT_DIR="-DQt5_DIR=${NANO_QT_DIR}" +if [[ ${QT_DIR:-} ]]; then + CMAKE_QT_DIR="-DQt5_DIR=${QT_DIR}" fi CMAKE_SANITIZER="" -if [[ ${NANO_SANITIZER:-} ]]; then - case "${NANO_SANITIZER}" in +if [[ ${SANITIZER:-} ]]; then + case "${SANITIZER}" in ASAN) CMAKE_SANITIZER="-DNANO_ASAN=ON" ;; @@ -36,7 +36,7 @@ if [[ ${NANO_SANITIZER:-} ]]; then CMAKE_SANITIZER="-DNANO_TSAN=ON" ;; *) - echo "Unknown sanitizer: '${NANO_SANITIZER}'" + echo "Unknown sanitizer: '${SANITIZER}'" exit 1 ;; esac @@ -53,11 +53,11 @@ cmake \ -DACTIVE_NETWORK=nano_${NANO_NETWORK:-"live"}_network \ -DNANO_TEST=${NANO_TEST:-OFF} \ -DNANO_GUI=${NANO_GUI:-OFF} \ --DCOVERAGE=${NANO_COVERAGE:-OFF} \ +-DCOVERAGE=${COVERAGE:-OFF} \ ${CMAKE_SANITIZER:-} \ ${CMAKE_QT_DIR:-} \ ${CMAKE_BACKTRACE:-} \ -${NODE_SRC} +${SRC} number_of_processors() { case "$(uname -s)" in @@ -90,4 +90,4 @@ parallel_build_flag() { cmake --build ${PWD} ${BUILD_TARGET} $(parallel_build_flag) -popd +popd \ No newline at end of file diff --git a/ci/prepare/windows/install-qt.ps1 b/ci/prepare/windows/install-qt.ps1 index 5f4f2b33..ac293592 100644 --- a/ci/prepare/windows/install-qt.ps1 +++ b/ci/prepare/windows/install-qt.ps1 @@ -42,4 +42,4 @@ foreach ($entry in $toDownload) { } # Save install location for subsequent steps -"NANO_QT_DIR=C:\Qt\5.15.2\msvc2019_64\lib\cmake\Qt5" >> $env:GITHUB_ENV \ No newline at end of file +"QT_DIR=C:\Qt\5.15.2\msvc2019_64\lib\cmake\Qt5" >> $env:GITHUB_ENV \ No newline at end of file