Commit e7edc6f0 authored by Lotrado's avatar Lotrado
Browse files

Reenabled cotire on linux CI builds.

parent 97b359df
...@@ -25,31 +25,29 @@ variables: ...@@ -25,31 +25,29 @@ variables:
- mirrage - mirrage
expire_in: 1 day expire_in: 1 day
.build-ninja: &build-ninja .build-ninja-linux: &build-ninja-linux
stage: build stage: build
script: script:
- cmake -E make_directory build - cmake -E make_directory build
- cd build - cd build
- cmake -E remove_directory src - cmake -E remove_directory src
- cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=../../mirrage -DCMAKE_BUILD_TYPE=Release -DMIRRAGE_ENABLE_COTIRE=OFF -DMIRRAGE_EXPORT_EXECUTABLE=ON .. - cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=../../mirrage -DCMAKE_BUILD_TYPE=Release -DMIRRAGE_EXPORT_EXECUTABLE=ON ..
- cmake --build . --target src/install - cmake --build . --target src/install
- cmake --build . --target test - cmake --build . --target test
<<: *linux-cache-spec
<<: *artifact-spec
build-gcc: build-gcc:
variables: variables:
CC: "gcc" CC: "gcc"
CXX: "g++" CXX: "g++"
<<: *build-ninja <<: *build-ninja-linux
<<: *linux-cache-spec
<<: *artifact-spec
build-clang: build-clang:
variables: variables:
CC: "clang" CC: "clang"
CXX: "clang++" CXX: "clang++"
<<: *build-ninja <<: *build-ninja-linux
<<: *linux-cache-spec
<<: *artifact-spec
build-scanbuild: build-scanbuild:
stage: build stage: build
...@@ -67,6 +65,14 @@ build-scanbuild: ...@@ -67,6 +65,14 @@ build-scanbuild:
when: always when: always
build-mingw: build-mingw:
stage: build
script:
- cmake -E make_directory build
- cd build
- cmake -E remove_directory src
- cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=../../mirrage -DCMAKE_BUILD_TYPE=Release -DMIRRAGE_ENABLE_COTIRE=OFF -DMIRRAGE_EXPORT_EXECUTABLE=ON ..
- cmake --build . --target src/install
- cmake --build . --target test
variables: variables:
CC: "gcc" CC: "gcc"
CXX: "g++" CXX: "g++"
...@@ -75,7 +81,6 @@ build-mingw: ...@@ -75,7 +81,6 @@ build-mingw:
only: only:
variables: variables:
- $WINDOWS_CI - $WINDOWS_CI
<<: *build-ninja
<<: *windows-cache-spec <<: *windows-cache-spec
<<: *artifact-spec <<: *artifact-spec
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment