diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e731c7f..16ad6c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,30 +8,12 @@ stages: - build -yamllint: - image: sdesbure/yamllint:latest - stage: lint - tags: - - docker-ci - script: - - apk update - - apk add --no-cache git - - git config --file=.gitmodules submodule.client.url ../client/client.git - - git config --file=.gitmodules submodule.shared-memory.url ../shared-memory/Shared-Memory.git - - git config --file=.gitmodules submodule.fltk.url ../fltk/fltk.git - - git submodule sync --recursive - - git submodule update --init client shared-memory fltk - - "#################################################################" - - yamllint --version - - "#################################################################" - - sh .ci/yamllint.sh - clang_tidy: image: jhase/ tags: - docker-ci script: - - clang-tidy;-header-filter=.;-checks=*; + - sh .ci/clang-tidy.sh; make_test: stage: test @@ -40,8 +22,28 @@ make_test: script: - apt-get update - apt-get install -y make cmake clang-tidy + - cd .. + - ls + - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.repo.digitech.hs-emden-leer.de/link/projekte/ws19/vkvm-new/library.git + - mkdir library/build + - cd library/build + - cmake .. + - make + - cd ../../terminal - mkdir build - cd build - cmake .. - make - make test + +cmake_build: + stage: build + tags: + - docker-ci + script: + - apt-get update + - apt-get install -y make cmake clang-tidy + - mkdir build + - cd build + - cmake .. + - make \ No newline at end of file