Release 2.2.4

makinacorpus · Jan 13, 2021 · 1330595 · 1330595
1 parent c4ecb5d
commit 1330595
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,14 +25,34 @@ jobs:
       - run: python3-coverage run setup.py test
       # - codecov/upload:
       #     when: on_success
-  build:
+  build_bionic:
     docker:
       - image: ubuntu:bionic
     environment:
       LANG: C.UTF-8
       DEBIAN_FRONTEND: noninteractive
     steps:
       - checkout
+      - run: sed -i 's/convertit (\([0-9]\+\.[0-9]\+\.[0-9]\+\)\(.*\)) RELEASED;/convertit (\1.ubuntu20.04\2) focal;/' debian/changelog
+      - run: apt-get update -q
+      - run: >
+          apt-get update && apt-get install -y
+          dh-virtualenv dpkg-dev debhelper dh-python python3-setuptools python3-all
+          python3-venv
+          unoconv inkscape
+      - run: dpkg-buildpackage -uc -us
+      - persist_to_workspace:
+          root: /root
+          paths: convertit_*_amd64.deb
+  build_focal:
+    docker:
+      - image: ubuntu:focal
+    environment:
+      LANG: C.UTF-8
+      DEBIAN_FRONTEND: noninteractive
+    steps:
+      - checkout
+      - run: sed -i 's/convertit (\([0-9]\+\.[0-9]\+\.[0-9]\+\)\(.*\)) RELEASED;/convertit (\1.ubuntu18.04\2) bionic;/' debian/changelog
       - run: apt-get update -q
       - run: DEBIAN_FRONTEND=noninteractive apt-get install -q -y software-properties-common
       - run: add-apt-repository ppa:jyrki-pulliainen/dh-virtualenv
@@ -64,14 +84,28 @@ workflows:
   version: 2
   all:
     jobs:
-      - codestyle
-      - test
-      - build
+      - codestyle:
+          filters:
+            tags:
+              only: /[0-9]+\.[0-9]+\.[0-9]+/
+      - test:
+          filters:
+            tags:
+              only: /[0-9]+\.[0-9]+\.[0-9]+/
+      - build_bionic:
+          filters:
+            tags:
+              only: /[0-9]+\.[0-9]+\.[0-9]+/
+      - build_focal:
+          filters:
+            tags:
+              only: /[0-9]+\.[0-9]+\.[0-9]+/
       - publish:
           requires:
             - codestyle
             - test
-            - build
+            - build_bionic
+            - build_focal
           filters:
             tags:
               only: /[0-9]+\.[0-9]+\.[0-9]+/

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,10 +2,10 @@
 CHANGELOG
 =========
 
-2.2.4.dev0
+2.2.4 (2021-01-13)
 ------------------
 
--
+- Fix binding service
 
 
 2.2.3 (2020-02-26)

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,8 @@
-convertit (2.2.4~dev0) bionic; urgency=medium
+convertit (2.2.4) RELEASED; urgency=medium
 
-  * ...
+  * Fix binding service
 
- -- Gaël UTARD <gael.utard@makina-corpus.com>  Wed, 26 Feb 2020 08:39:29 +0100
+ -- Timothée DE MONTETY <timothee.de-montety@makina-corpus.com>  Wed, 13 Jan 2021 09:39:10 +0100
 
 convertit (2.2.3) bionic; urgency=medium
 

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
 
 
 setup(name='convertit',
-      version='2.2.4.dev0',
+      version='2.2.4',
       description='A file conversion Web API in Pyramid',
       long_description=README + '\n\n' + CHANGES,
       license='AGPLV3',