From defca031ebb93de05c444da1ee16644b6d363b74 Mon Sep 17 00:00:00 2001
From: Vincent Delbar <vincent.delbar@latelescop.fr>
Date: Thu, 1 Jun 2023 21:10:05 +0000
Subject: [PATCH 1/2] CI: test workflow rules taken from docs
---
.gitlab-ci.yml | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77cfdca..dea3721 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,11 @@ cache:
workflow:
rules:
- - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME == "develop" || $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_COMMIT_TAG
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_COMMIT_REF_PROTECTED && $CI_OPEN_MERGE_REQUESTS
+ when: never
+ - if: $CI_COMMIT_REF_PROTECTED
stages:
- Static Analysis
@@ -99,10 +103,9 @@ test_pipeline:
docs:
stage: Ship
- #when: manual
+ when: manual
only:
- - master
- - develop
+ - tags
before_script:
- apt update && apt install -y python3.8-venv
- python3 -m venv docs_venv
@@ -117,14 +120,13 @@ docs:
pypi:
stage: Ship
- #when: manual
+ when: manual
only:
- - master
- - develop
+ - tags
before_script:
- apt update && apt install -y python3.8-venv
- - pip install --upgrade build twine
+ - pip install build twine
script:
- python3 -m build
- python3 -m twine upload --non-interactive -u __token__ -p $pypi_token dist/*
--
GitLab
From a7484cbac5a4c66a6a2349b84e99265660696ac1 Mon Sep 17 00:00:00 2001
From: Vincent Delbar <vincent.delbar@latelescop.fr>
Date: Thu, 1 Jun 2023 23:13:10 +0200
Subject: [PATCH 2/2] CI: bump dev version
---
pyotb/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyotb/__init__.py b/pyotb/__init__.py
index 65943d1..5191fd6 100644
--- a/pyotb/__init__.py
+++ b/pyotb/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""This module provides convenient python wrapping of otbApplications."""
-__version__ = "2.0.0.dev1"
+__version__ = "2.0.0.dev2"
from .helpers import logger, set_logger_level
from .apps import *
--
GitLab