From 725f1e742dd2f13296b3b7808ea20c68e273939f Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Thu, 6 Aug 2020 10:43:37 +0200 Subject: [PATCH] Switch to actual commands inside of the steps Signed-off-by: Kevin Ottens --- .drone.yml | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6bc04b412..21fcc6438 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,23 +8,19 @@ steps: - name: build path: /drone/build commands: - - /bin/bash -c " - export CC=gcc-10 && - export CXX=g++-10 && - cd /drone/build && - cmake -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../src && - make -j$(nproc)" + - cd /drone/build + - cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../src + - make -j$(nproc) - name: test image: nextcloudci/client-5.12:client-5.12-10 volumes: - name: build path: /drone/build commands: - - /bin/bash -c " - cd /drone/build && - useradd -m -s /bin/bash test && - chown -R test:test . && - su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test" + - cd /drone/build + - useradd -m -s /bin/bash test + - chown -R test:test . + - su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test volumes: - name: build @@ -48,23 +44,19 @@ steps: - name: build path: /drone/build commands: - - /bin/bash -c " - export CC=clang-10 && - export CXX=clang++-10 && - cd /drone/build && - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../src && - make -j$(nproc)" + - cd /drone/build + - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clang++-10 -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../src + - make -j$(nproc) - name: test image: nextcloudci/client-5.12:client-5.12-10 volumes: - name: build path: /drone/build commands: - - /bin/bash -c " - cd /drone/build && - useradd -m -s /bin/bash test && - chown -R test:test . && - su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test" + - cd /drone/build + - useradd -m -s /bin/bash test + - chown -R test:test . + - su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test - name: clang-tidy image: nextcloudci/client-5.12:client-5.12-10 volumes: -- 2.30.2