aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ci/common/build.sh8
-rwxr-xr-xci/snap/script.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh
index 0024f2cbd5..e14c97cb81 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -37,13 +37,13 @@ build_deps() {
# update CMake configuration and update to newer deps versions.
cd "${DEPS_BUILD_DIR}"
echo "Configuring with '${DEPS_CMAKE_FLAGS}'."
- CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/"
+ CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/third-party/"
if ! top_make; then
exit 1
fi
- cd "${TRAVIS_BUILD_DIR}"
+ cd "${CI_BUILD_DIR}"
}
prepare_build() {
@@ -54,7 +54,7 @@ prepare_build() {
mkdir -p "${BUILD_DIR}"
cd "${BUILD_DIR}"
echo "Configuring with '${CMAKE_FLAGS} $@'."
- cmake -G Ninja ${CMAKE_FLAGS} "$@" "${TRAVIS_BUILD_DIR}"
+ cmake -G Ninja ${CMAKE_FLAGS} "$@" "${CI_BUILD_DIR}"
}
build_nvim() {
@@ -84,5 +84,5 @@ build_nvim() {
fi
check_sanitizer "${LOG_DIR}"
- cd "${TRAVIS_BUILD_DIR}"
+ cd "${CI_BUILD_DIR}"
}
diff --git a/ci/snap/script.sh b/ci/snap/script.sh
index f0d45fea00..21d3421044 100755
--- a/ci/snap/script.sh
+++ b/ci/snap/script.sh
@@ -3,6 +3,6 @@
set -e
set -o pipefail
-mkdir -p "$TRAVIS_BUILD_DIR/snaps-cache"
+mkdir -p "$CI_BUILD_DIR/snaps-cache"
sg lxd -c snapcraft