Merge branch 'master' into develop

post-luxembourg · Aug 12, 2024 · f8fc502 · f8fc502
2 parents fdf005e + 58dbb58
commit f8fc502
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -49,6 +49,9 @@ jobs:
   publish:
     needs: test
     runs-on: ubuntu-latest
+    if: >
+        github.event_name == 'push' &&
+        startsWith(github.event.ref, 'refs/tags')
     steps:
       - uses: actions/checkout@v4
       - name: Build distribution
@@ -60,9 +63,6 @@ jobs:
           pip install .[dev,test]
           pyproject-build
       - name: Publish package
-        if: >
-            github.event_name == 'push' &&
-            startsWith(github.event.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@v1.5.0
         with:
           user: __token__

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -174,8 +174,6 @@ typecheck:
     - pip install mypy
     - mypy ${SRC_ROOT}
   rules:
-    - if: $CI_COMMIT_TAG
-      when: never
     - when: on_success
 
 unit-tests:
@@ -217,6 +215,9 @@ upload:
        post-luxembourg/clproc.git"
     - "git checkout ${CI_COMMIT_BRANCH}"
     - "git push github ${CI_COMMIT_BRANCH}"
+    - "git push github --tags"
   rules:
     - if: "$CI_COMMIT_REF_PROTECTED == 'true'"
       when: on_success
+    - if: $CI_COMMIT_TAG
+      when: on_success
diff --git a/changelog.in b/changelog.in
@@ -11,6 +11,7 @@
 
 # version   ; type    ; subject                                                           ; issues  ;i;h;detail
 #--------------------------------------------------------------------------------------------------------------------------
+2024.08.12  ; support ; First public release                                              ;         ; ; ;
 2024.02.08  ; support ; Switch to calendar-versioning                                     ;         ; ; ;
 1.3.1.post1 ; changed ; Update fabfile                                                    ;         ; ; ;
 1.3.1       ; fixed   ; Don't crash if the release-info file does not exist               ;         ; ; ;

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clproc"
-version = "2024.02.08"
+version = "2024.08.12"
 authors = [
   { name="Michel Albert", email="michel.albert@post.lu" },
 ]