Skip to content
Snippets Groups Projects
Verified Commit 266fd5ec authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Move hunter dir out of builddir

Otherwise libevent may pick up the git version of mtxclient...
parent 2a841b43
No related branches found
No related tags found
No related merge requests found
Pipeline #1287 passed
......@@ -64,22 +64,22 @@ build synapse arm64:
- update-alternatives --install /usr/bin/g++ g++ "/usr/bin/${CXX}" 10
- update-alternatives --set gcc "/usr/bin/${CC}"
- update-alternatives --set g++ "/usr/bin/${CXX}"
- rm -rf ../.hunter && mv .hunter ../.hunter || true
script:
- curl -s -f -k https://synapse:8008/_matrix/client/versions
- export PATH="/usr/lib/ccache:${PATH}"
- export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
- export PATH="/usr/local/bin/:${PATH}"
- mkdir -p .deps/usr .hunter
- mkdir -p build
- cmake -GNinja -H. -Bbuild
-DCMAKE_INSTALL_PREFIX=.deps/usr
-DHUNTER_ROOT=".hunter"
-DHUNTER_ROOT="../.hunter"
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF
-DCMAKE_BUILD_TYPE=Debug -DHUNTER_CONFIGURATION_TYPES=Debug
-DCI_BUILD=ON
-DCOVERAGE=${COVERAGE}
- cmake --build build
- MTXCLIENT_SERVER=synapse GTEST_OUTPUT=xml:junit-output/ make test
- mv ../.hunter .hunter
cache:
key: "$CI_JOB_NAME"
paths:
......@@ -120,17 +120,19 @@ build-macos:
- brew update
- brew reinstall --force python3
- brew bundle --file=./.ci/macos/Brewfile --force --cleanup
- rm -rf ../.hunter && mv .hunter ../.hunter || true
script:
- export PATH=/usr/local/opt/qt/bin/:${PATH}
- cmake -GNinja -H. -Bbuild
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DCMAKE_INSTALL_PREFIX=.deps/usr
-DHUNTER_ROOT=".hunter"
-DHUNTER_ROOT="../.hunter"
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo
-DUSE_BUNDLED_OPENSSL=ON
-DCI_BUILD=ON
- cmake --build build
- mv ../.hunter .hunter
cache:
key: "${CI_JOB_NAME}"
paths:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment