From 48dd1a439a3b56697bc88538f57b4cdce8a5e068 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 11:43:43 +0100
Subject: [PATCH 1/6] Update conditions to protected refs
---
.gitlab/ci/docker-compose-tests.yml | 3 ++-
.gitlab/ci/docker.yml | 3 ++-
.gitlab/ci/pip.yml | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitlab/ci/docker-compose-tests.yml b/.gitlab/ci/docker-compose-tests.yml
index e54b2f8..e3e5937 100644
--- a/.gitlab/ci/docker-compose-tests.yml
+++ b/.gitlab/ci/docker-compose-tests.yml
@@ -7,7 +7,8 @@ Tests with docker compose:
- name: docker:dind
entrypoint: ["dockerd-entrypoint.sh", "--tls=false"]
stage: Docker compose tests
- except: [main, tags]
+ except:
+ - $CI_COMMIT_REF_PROTECTED == "true"
before_script:
- docker compose build
script:
diff --git a/.gitlab/ci/docker.yml b/.gitlab/ci/docker.yml
index 14df9e8..c6136ea 100644
--- a/.gitlab/ci/docker.yml
+++ b/.gitlab/ci/docker.yml
@@ -26,7 +26,8 @@ variables:
Build dev image:
extends: .docker_build_base
- except: [main, tags]
+ except:
+ - $CI_COMMIT_REF_PROTECTED == "true"
script:
- echo "Pushing to $DEV_IMAGE"
- docker push $DEV_IMAGE
diff --git a/.gitlab/ci/pip.yml b/.gitlab/ci/pip.yml
index 41d50bc..1a850ee 100644
--- a/.gitlab/ci/pip.yml
+++ b/.gitlab/ci/pip.yml
@@ -9,7 +9,8 @@ variables:
Build pip package:
stage: Pip
image: $PYTHON_IMG
- only: [tags]
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_TAG
script:
- apt update && apt install -y git && apt clean
- pip install build twine
--
GitLab
From c58db21625a717ebcd00025b519773a0eb2aff18 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 12:34:18 +0100
Subject: [PATCH 2/6] Update protected condition
---
.gitlab/ci/docker-compose-tests.yml | 4 ++--
.gitlab/ci/docker.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab/ci/docker-compose-tests.yml b/.gitlab/ci/docker-compose-tests.yml
index e3e5937..1356bff 100644
--- a/.gitlab/ci/docker-compose-tests.yml
+++ b/.gitlab/ci/docker-compose-tests.yml
@@ -7,8 +7,8 @@ Tests with docker compose:
- name: docker:dind
entrypoint: ["dockerd-entrypoint.sh", "--tls=false"]
stage: Docker compose tests
- except:
- - $CI_COMMIT_REF_PROTECTED == "true"
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "false"
before_script:
- docker compose build
script:
diff --git a/.gitlab/ci/docker.yml b/.gitlab/ci/docker.yml
index c6136ea..caaf10f 100644
--- a/.gitlab/ci/docker.yml
+++ b/.gitlab/ci/docker.yml
@@ -26,8 +26,8 @@ variables:
Build dev image:
extends: .docker_build_base
- except:
- - $CI_COMMIT_REF_PROTECTED == "true"
+ rules:
+ - $CI_COMMIT_REF_PROTECTED == "false"
script:
- echo "Pushing to $DEV_IMAGE"
- docker push $DEV_IMAGE
--
GitLab
From 2ee3bc8f2814bd567559a2049581cf10cb142ced Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 14:10:16 +0100
Subject: [PATCH 3/6] Update static analysis run condition
---
.gitlab/ci/static-analysis.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab/ci/static-analysis.yml b/.gitlab/ci/static-analysis.yml
index d5eeba6..cd8af50 100644
--- a/.gitlab/ci/static-analysis.yml
+++ b/.gitlab/ci/static-analysis.yml
@@ -12,7 +12,8 @@ variables:
stage: Static Analysis
image: $STATIC_ANALYSIS_IMG
allow_failure: true
- except: [main, tags]
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "false"
.static_analysis_with_pip_install:
extends: .static_analysis_base
--
GitLab
From e90b2c90c4b43e8d88b4baf7adbaed7bdb469438 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 14:13:39 +0100
Subject: [PATCH 4/6] Fix docker run
---
.gitlab/ci/docker.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab/ci/docker.yml b/.gitlab/ci/docker.yml
index caaf10f..e4feaf9 100644
--- a/.gitlab/ci/docker.yml
+++ b/.gitlab/ci/docker.yml
@@ -27,7 +27,7 @@ variables:
Build dev image:
extends: .docker_build_base
rules:
- - $CI_COMMIT_REF_PROTECTED == "false"
+ - if: $CI_COMMIT_REF_PROTECTED == "false"
script:
- echo "Pushing to $DEV_IMAGE"
- docker push $DEV_IMAGE
--
GitLab
From 5039bbde03352fd97f8b2d239c66d81817f64dea Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 14:27:29 +0100
Subject: [PATCH 5/6] Update condition
---
.gitlab/ci/doc.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab/ci/doc.yml b/.gitlab/ci/doc.yml
index 61f4103..6816b39 100644
--- a/.gitlab/ci/doc.yml
+++ b/.gitlab/ci/doc.yml
@@ -13,15 +13,15 @@ variables:
pages_test:
extends: .doc_base
- except:
- - main
- - tags
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "false"
script:
- mkdocs build --site-dir public_test
pages:
extends: .doc_base
- only: [main]
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
script:
- mkdocs build --site-dir public
artifacts:
--
GitLab
From 276f4cc1ad71d36b2a334f0d741b58877fbcff24 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 14:30:38 +0100
Subject: [PATCH 6/6] Update condition
---
.gitlab/ci/doc.yml | 1 +
.gitlab/ci/docker-compose-tests.yml | 1 +
.gitlab/ci/docker.yml | 1 +
.gitlab/ci/pip.yml | 1 +
.gitlab/ci/static-analysis.yml | 1 +
5 files changed, 5 insertions(+)
diff --git a/.gitlab/ci/doc.yml b/.gitlab/ci/doc.yml
index 6816b39..f48ec80 100644
--- a/.gitlab/ci/doc.yml
+++ b/.gitlab/ci/doc.yml
@@ -15,6 +15,7 @@ pages_test:
extends: .doc_base
rules:
- if: $CI_COMMIT_REF_PROTECTED == "false"
+ when: always
script:
- mkdocs build --site-dir public_test
diff --git a/.gitlab/ci/docker-compose-tests.yml b/.gitlab/ci/docker-compose-tests.yml
index 1356bff..0a1da79 100644
--- a/.gitlab/ci/docker-compose-tests.yml
+++ b/.gitlab/ci/docker-compose-tests.yml
@@ -9,6 +9,7 @@ Tests with docker compose:
stage: Docker compose tests
rules:
- if: $CI_COMMIT_REF_PROTECTED == "false"
+ when: always
before_script:
- docker compose build
script:
diff --git a/.gitlab/ci/docker.yml b/.gitlab/ci/docker.yml
index e4feaf9..92fed33 100644
--- a/.gitlab/ci/docker.yml
+++ b/.gitlab/ci/docker.yml
@@ -28,6 +28,7 @@ Build dev image:
extends: .docker_build_base
rules:
- if: $CI_COMMIT_REF_PROTECTED == "false"
+ when: always
script:
- echo "Pushing to $DEV_IMAGE"
- docker push $DEV_IMAGE
diff --git a/.gitlab/ci/pip.yml b/.gitlab/ci/pip.yml
index 1a850ee..6333b39 100644
--- a/.gitlab/ci/pip.yml
+++ b/.gitlab/ci/pip.yml
@@ -11,6 +11,7 @@ Build pip package:
image: $PYTHON_IMG
rules:
- if: $CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_TAG
+ when: always
script:
- apt update && apt install -y git && apt clean
- pip install build twine
diff --git a/.gitlab/ci/static-analysis.yml b/.gitlab/ci/static-analysis.yml
index cd8af50..136ee6f 100644
--- a/.gitlab/ci/static-analysis.yml
+++ b/.gitlab/ci/static-analysis.yml
@@ -14,6 +14,7 @@ variables:
allow_failure: true
rules:
- if: $CI_COMMIT_REF_PROTECTED == "false"
+ when: always
.static_analysis_with_pip_install:
extends: .static_analysis_base
--
GitLab