From 5626d5c6b9219cf0c65568d078ec2c305453b4c3 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 18 May 2020 13:17:20 +0200
Subject: [PATCH] [CI] Changed to rules syntax.
---
scripts/ci/jobs/build_image.yml | 14 ++++++++------
scripts/docker/Dockerfile.pre-commit | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index 00b463b2788..aa8a2451134 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -1,7 +1,7 @@
build gcc images:
stage: .pre
- only:
- changes:
+ rules:
+ - changes:
- ThirdParty/container-maker
- scripts/ci/jobs/build_image.yml
tags:
@@ -20,9 +20,10 @@ build gcc images:
build xunit-to-junit image:
stage: .pre
- only:
- changes:
+ rules:
+ - changes:
- scripts/docker/saxon/**/*
+ - scripts/ci/jobs/build_image.yml
tags:
- docker-shell
variables:
@@ -36,9 +37,10 @@ build xunit-to-junit image:
build pre-commit image:
stage: .pre
- only:
- changes:
+ rules:
+ - changes:
- scripts/docker/Dockerfile.pre-commit
+ - scripts/ci/jobs/build_image.yml
tags:
- docker-shell
variables:
diff --git a/scripts/docker/Dockerfile.pre-commit b/scripts/docker/Dockerfile.pre-commit
index 3d7d0a536e7..7ddfafa2fa3 100644
--- a/scripts/docker/Dockerfile.pre-commit
+++ b/scripts/docker/Dockerfile.pre-commit
@@ -1,6 +1,6 @@
FROM python:slim
-RUN pip install pre-commit
+RUN pip install pre-commit==2.4.0
CMD ["bash"]
RUN apt-get update \
&& apt-get install -y --no-install-recommends git curl \
--
GitLab