Combine bith test stages in one instead of importing libs

vbeffara · Apr 12, 2020 · d6197e1 · d6197e1
1 parent f24b45d
commit d6197e1
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,27 +4,19 @@ before_script:
   - apt-get update -qq
   - apt-get install -qq python3-pip cmake m4 g++ ninja-build git lcov ruby libgl1-mesa-dev libxcb-shm0 yasm
   - apt-get install -qq xvfb libglu1-mesa-dev xorg-dev libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
+  - pip3 install -q conan codecov
+  - gem install coveralls-lcov
 
-cmake:
+everything:
   stage: build
   script:
-    - pip3 install -q conan
     - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
     - conan remote add vb https://api.bintray.com/conan/vbeffara/misc
     - conan profile new default --detect
     - conan profile update settings.compiler.libcxx=libstdc++11 default
     - mkdir -p build/cov
     - cmake -B build -G Ninja -DCOV=1
     - cmake --build build
-  artifacts:
-    paths:
-      - build/
-
-unittests:
-  stage: test
-  script:
-    - gem install coveralls-lcov
-    - pip3 install codecov
     - Xvfb :4 &
     - export DISPLAY=:4
     - lcov -z -d build