Commit 06b8d036 authored by Dave Moxey's avatar Dave Moxey

Merge branch 'fix/ci-restrictions' into 'master'

Fix restrictions on CI builds to build solely master on main project, not forks

See merge request !1131
parents 8842a63f 59f75301
......@@ -8,11 +8,18 @@ stages:
only:
refs:
- merge_requests
- master
- tags
- web
- master@nektar/nektar
- tags@nektar/nektar
- web@nektar/nektar
changes:
- "**/*"
- "cmake/**/*"
- "docker/**/*"
- "docs/**/*"
- "library/**/*"
- "solvers/**/*"
- "tests/**/*"
- "utilities/**/*"
- ".gitlab-ci/*"
- .dockerignore
- .gitmodules
- .gitlab-ci.yml
......@@ -65,6 +72,7 @@ stages:
- docker rm $CONTAINER_NAME
- exit $exit_code;
artifacts:
expire_in: 1 month
paths:
- log/
timeout: 3h
......@@ -189,6 +197,7 @@ user-guide-build:
- cmake -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DNEKTAR_BUILD_LIBRARY:BOOL=OFF -DNEKTAR_BUILD_SOLVERS:BOOL=OFF -DNEKTAR_BUILD_UTILITIES:BOOL=OFF -DNEKTAR_BUILD_TESTS:BOOL=OFF -DNEKTAR_BUILD_DOC:BOOL=ON .
- make -C build -j 4 user-guide-pdf user-guide-html developer-guide-pdf developer-guide-html
artifacts:
expire_in: 1 month
paths:
- build/docs/user-guide/user-guide.pdf
- build/docs/user-guide/html
......@@ -201,6 +210,7 @@ doxygen-build:
- cmake -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DNEKTAR_BUILD_LIBRARY:BOOL=OFF -DNEKTAR_BUILD_SOLVERS:BOOL=OFF -DNEKTAR_BUILD_UTILITIES:BOOL=OFF -DNEKTAR_BUILD_TESTS:BOOL=OFF -DNEKTAR_BUILD_DOC:BOOL=ON .
- make -C build doc
artifacts:
expire_in: 1 month
paths:
- build/docs/doxygen/html/
......@@ -212,6 +222,7 @@ tutorials-build:
- cmake -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release .
- make -C build -j 2 tutorials-pdf tutorials-html
artifacts:
expire_in: 1 month
paths:
- build/docs/tutorial/
......
......@@ -31,6 +31,7 @@ v5.0.1
**CI**
- Switched to Gitlab CI (!1120, !1120, !1128, !1129)
- Added checked conversion from double to int in SessionReader (!1113)
- Switched to Gitlab CI (!1120, !1120, !1128, !1129, !1131)
v5.0.0
------
......
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