From b98dc786071ac9e5f15e77334326df5026f51eca Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 16 Jun 2020 13:45:30 +0200
Subject: [PATCH] [ci] Avoid unnecessary cache downloads.
---
scripts/ci/jobs/build-docs.yml | 2 ++
scripts/ci/jobs/code-quality.yml | 2 ++
scripts/ci/jobs/container.yml | 4 +++-
scripts/ci/jobs/pre-commit.yml | 2 ++
scripts/ci/jobs/web.yml | 4 ++++
5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/scripts/ci/jobs/build-docs.yml b/scripts/ci/jobs/build-docs.yml
index 2865043bc0e..ebd05752dcc 100644
--- a/scripts/ci/jobs/build-docs.yml
+++ b/scripts/ci/jobs/build-docs.yml
@@ -2,6 +2,8 @@ build docs:
stage: build
image:
name: $CONTAINER_GCC_IMAGE
+ extends:
+ - .defaults
before_script:
# HACK to easier linking to the generated pages
diff --git a/scripts/ci/jobs/code-quality.yml b/scripts/ci/jobs/code-quality.yml
index 6e8cfb4b6ac..8817480eee4 100644
--- a/scripts/ci/jobs/code-quality.yml
+++ b/scripts/ci/jobs/code-quality.yml
@@ -1,5 +1,7 @@
code_quality:
stage: checks
+ extends:
+ - .defaults
rules:
variables:
DOCKER_TLS_CERTDIR: "/certs"
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index 8dc7fbb98fd..9f9630b21c5 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -9,7 +9,9 @@ container:
GIT_STRATEGY: fetch
OPENMPI_VERSIONS: 'off 2.1.6 3.1.4 4.0.1'
GIT_LFS_SKIP_SMUDGE: "1"
- extends: .container-maker-setup
+ extends:
+ - .defaults
+ - .container-maker-setup
script:
- python ThirdParty/container-maker/ogscm/cli.py -B -C -R --ogs . --pm system --cvode --ompi $OPENMPI_VERSIONS
artifacts:
diff --git a/scripts/ci/jobs/pre-commit.yml b/scripts/ci/jobs/pre-commit.yml
index c7907d70114..627e2dd9dad 100644
--- a/scripts/ci/jobs/pre-commit.yml
+++ b/scripts/ci/jobs/pre-commit.yml
@@ -2,6 +2,8 @@ pre commit:
stage: pre-checks
image:
name: $PRECOMMIT_IMAGE
+ extends:
+ - .defaults
script:
- pre-commit install
- pre-commit run --all-files
diff --git a/scripts/ci/jobs/web.yml b/scripts/ci/jobs/web.yml
index 1c49c828884..784798da397 100644
--- a/scripts/ci/jobs/web.yml
+++ b/scripts/ci/jobs/web.yml
@@ -18,6 +18,8 @@ web url checker:
preview web site:
stage: build
image: $WEB_IMAGE
+ extends:
+ - .defaults
script:
# HACK to easier linking to the generated pages
- echo '<meta http-equiv="REFRESH" content="0;URL=web/public/index.html">' >> WebPreview.html
@@ -41,6 +43,8 @@ preview web site:
deploy web site:
stage: package
image: $WEB_IMAGE
+ extends:
+ - .defaults
script:
- cd web
- yarn
--
GitLab