From 6fd0945da25c1ce82e9b81b1c055387d326fba91 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 8 Dec 2022 10:26:27 +0100
Subject: [PATCH] [ci] Simplify pages url setup.
---
.gitlab-ci.yml | 1 +
scripts/ci/jobs/build-docs.yml | 2 +-
scripts/ci/jobs/code-coverage.yml | 2 +-
scripts/ci/jobs/web.yml | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9eec316bd68..a785baa692b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ variables:
BUILD_TESTS: "true"
BUILD_CTEST: "true"
CPU_TARGET: ivybridge # envinf1 has oldest cpu
+ ARTIFACTS_PAGES_URL: https://$CI_PROJECT_ROOT_NAMESPACE.$CI_PAGES_DOMAIN/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts
workflow:
rules:
diff --git a/scripts/ci/jobs/build-docs.yml b/scripts/ci/jobs/build-docs.yml
index 5fb94256897..f928d85ddd7 100644
--- a/scripts/ci/jobs/build-docs.yml
+++ b/scripts/ci/jobs/build-docs.yml
@@ -54,7 +54,7 @@ build docs:
when: always
environment:
name: doxygen preview
- url: "https://$CI_PROJECT_ROOT_NAMESPACE.$CI_PAGES_DOMAIN/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/build/docs/index.html"
+ url: ${ARTIFACTS_PAGES_URL}/build/docs/index.html
deploy docs:
stage: package
diff --git a/scripts/ci/jobs/code-coverage.yml b/scripts/ci/jobs/code-coverage.yml
index b63760a187d..02091d45a8f 100644
--- a/scripts/ci/jobs/code-coverage.yml
+++ b/scripts/ci/jobs/code-coverage.yml
@@ -37,4 +37,4 @@ code coverage:
path: build/coverage/coverage.xml
environment:
name: code coverage
- url: "https://$CI_PROJECT_ROOT_NAMESPACE.$CI_PAGES_DOMAIN/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/build/coverage/coverage_report/index.html"
+ url: ${ARTIFACTS_PAGES_URL}/build/coverage/coverage_report/index.html
diff --git a/scripts/ci/jobs/web.yml b/scripts/ci/jobs/web.yml
index d2e8d115010..f6fd81e3bf8 100644
--- a/scripts/ci/jobs/web.yml
+++ b/scripts/ci/jobs/web.yml
@@ -55,7 +55,7 @@ preview web site:
expire_in: 1 week
environment:
name: web preview
- url: "https://$CI_PROJECT_ROOT_NAMESPACE.$CI_PAGES_DOMAIN/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/web/public/index.html"
+ url: ${ARTIFACTS_PAGES_URL}/web/public/index.html
cache:
paths:
- web/node_modules
--
GitLab