Commit 24feb9db authored by Chris Cantwell's avatar Chris Cantwell

Merge branch 'fix/gitlab-ci-timeout' into 'master'

Fix/gitlab ci timeout

See merge request !1129
parents 62deb785 041acb3e
Pipeline #1651 passed with stages
in 212 minutes and 23 seconds
......@@ -24,6 +24,7 @@ stages:
<<: *execution-conditions
stage: build-env
image: docker:19.03.6
timeout: 30m
.build-and-test-template: &build-and-test-template
<<: *execution-conditions
......@@ -66,6 +67,7 @@ stages:
artifacts:
paths:
- log/
timeout: 3h
.compiler-warning-template: &compiler-warning-template
<<: *execution-conditions
......@@ -83,6 +85,7 @@ stages:
exit 1;
fi
allow_failure: true
timeout: 15m
################################################
################### DEBIAN ###################
......@@ -411,4 +414,6 @@ win10-default-build-and-test:
- cmake.exe --build . --target ALL_BUILD --config Debug
- cmake.exe --build . --target INSTALL --config Debug
- ctest --output-on-failure -C Debug -j3
after_script:
- Remove-Item -Recurse -Force build
needs: []
......@@ -14,6 +14,11 @@ v5.0.1
**Library**
- Fix incorrect coordinate dimension used in history point filter (!1118)
v5.0.1
------
**CI**
- Switched to Gitlab CI (!1120, !1120, !1128, !1129)
v5.0.0
------
**Library**
......
Markdown is supported
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