Skip to content
Snippets Groups Projects
Commit 564d8835 authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'fix-doxygen-ui-link' into 'master'

[ci] Fixed Doxygen link in MR user interface.

See merge request ogs/ogs!3052
parents 52708132 f41d983f
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,6 @@ workflow: ...@@ -28,7 +28,6 @@ workflow:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # master, ogs/ogs repo only - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # master, ogs/ogs repo only
include: include:
- template: 'Code-Quality.gitlab-ci.yml'
# extends # extends
- local: '/scripts/ci/extends/defaults.yml' - local: '/scripts/ci/extends/defaults.yml'
- local: '/scripts/ci/extends/rules.yml' - local: '/scripts/ci/extends/rules.yml'
...@@ -37,7 +36,8 @@ include: ...@@ -37,7 +36,8 @@ include:
- local: '/scripts/ci/extends/container-maker-setup.yml' - local: '/scripts/ci/extends/container-maker-setup.yml'
- local: '/scripts/ci/extends/vs2019-environment.yml' - local: '/scripts/ci/extends/vs2019-environment.yml'
- local: '/scripts/ci/extends/test-artifacts.yml' - local: '/scripts/ci/extends/test-artifacts.yml'
# jobs - local: '/scripts/ci/jobs/meta.yml'
# jobs, can be indiviually disabled for testing
- local: '/scripts/ci/jobs/pre-commit.yml' - local: '/scripts/ci/jobs/pre-commit.yml'
- local: '/scripts/ci/jobs/build_image.yml' - local: '/scripts/ci/jobs/build_image.yml'
- local: '/scripts/ci/jobs/build-linux.yml' - local: '/scripts/ci/jobs/build-linux.yml'
...@@ -47,14 +47,14 @@ include: ...@@ -47,14 +47,14 @@ include:
- local: '/scripts/ci/jobs/build-win.yml' - local: '/scripts/ci/jobs/build-win.yml'
- local: '/scripts/ci/jobs/build-mac.yml' - local: '/scripts/ci/jobs/build-mac.yml'
- local: '/scripts/ci/jobs/checks.yml' - local: '/scripts/ci/jobs/checks.yml'
- local: '/scripts/ci/jobs/container.yml' - template: 'Code-Quality.gitlab-ci.yml'
- local: '/scripts/ci/jobs/code-quality.yml'
- local: '/scripts/ci/jobs/build-gui-linux.yml' - local: '/scripts/ci/jobs/build-gui-linux.yml'
- local: '/scripts/ci/jobs/build-gui-win.yml' - local: '/scripts/ci/jobs/build-gui-win.yml'
- local: '/scripts/ci/jobs/build-gui-mac.yml' - local: '/scripts/ci/jobs/build-gui-mac.yml'
- local: '/scripts/ci/jobs/check-header.yml' - local: '/scripts/ci/jobs/check-header.yml'
- local: '/scripts/ci/jobs/tests-large.yml' - local: '/scripts/ci/jobs/tests-large.yml'
- local: '/scripts/ci/jobs/web.yml'
- local: '/scripts/ci/jobs/clang-sanitizer.yml' - local: '/scripts/ci/jobs/clang-sanitizer.yml'
- local: '/scripts/ci/jobs/clang-tidy.yml' - local: '/scripts/ci/jobs/clang-tidy.yml'
- local: '/scripts/ci/jobs/code-quality.yml' - local: '/scripts/ci/jobs/web.yml'
- local: '/scripts/ci/jobs/meta.yml' - local: '/scripts/ci/jobs/container.yml'
...@@ -15,7 +15,7 @@ build docs: ...@@ -15,7 +15,7 @@ build docs:
expose_as: 'Doxygen' expose_as: 'Doxygen'
paths: paths:
- Doxygen.html - Doxygen.html
- build/docs/ - build/docs
expire_in: 1 week expire_in: 1 week
check docs links: check docs links:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment