diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da44e1629fd24c74561ec02b33d6a03d0a2aa15a..f1ab7e7655fbfd231782f882f0a0acca687230db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,2 @@ -stages: - - build - - test - - deploy - include: - - remote: 'https://gitlab.com/r2devops/hub/-/raw/template_release@0.2.1/jobs/template_release/template_release.yml' + - remote: 'https://gitlab.com/r2devops/hub/-/raw/template_release@0.5.2/jobs/template_release/template_release.yml' diff --git a/CHANGELOG.md b/CHANGELOG.md index 84ced14fcc3d4b0d445c5ec45e8bcc3ca1086261..b531869371e0b5a8be66606bd101d1c0d57d9d46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,19 @@ All notable changes to this job will be documented in this file. +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + ## [Unreleased] +... + +## [0.2.4] - 2024-05-08 + +### Fixed + +* release-by-changelog-venv job now only runs on tags + ## [0.2.3] - 2024-05-06 ### Fixed diff --git a/pyproject.toml b/pyproject.toml index 8e2811d957f1ee58af17cf6134710e47b215039b..e4011db0a5dbbcabd244da7f62e32297b6528bd3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ allow-dirty = true commit = true config-file = "pyproject.toml" -current_version = "0.2.3" +current_version = "0.2.4" parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)" replace = "{new_version}" search = "{current_version}" diff --git a/release-by-changelog.yml b/release-by-changelog.yml index c6973095a154ebc26073a27c9e9925fdc6a0ca86..8a2fb4bbaaa4c9f5463815b60bdeea0df339a13f 100644 --- a/release-by-changelog.yml +++ b/release-by-changelog.yml @@ -1,10 +1,6 @@ include: - remote: 'https://lab.frogg.it/swepy/cicd-templates/venv/-/raw/venv@1.0.0/venv.yml' -venv: - rules: - - when: never - release_by_changelog_venv: extends: venv stage: build @@ -12,9 +8,12 @@ release_by_changelog_venv: PYTHON_SETUP: 'pip install release_by_changelog' VENV_ARTIFACT_NAME: 'release_by_changelog_venv' rules: - - when: null - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' +venv: + rules: + - when: never + release_by_changelog: variables: IMAGE_NAME: 'python' @@ -30,7 +29,7 @@ release_by_changelog: - cd $PROJECT_PATH - pwd # Debug script: - - echo RELEASE_BY_CHANGELOG # Debug + - echo $RELEASE_BY_CHANGELOG # Debug - $RELEASE_BY_CHANGELOG needs: - job: release_by_changelog_venv