From 66543982136f73eea1385fa228b7b5bae43c6f0e Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 17 Oct 2020 15:08:49 -0700
Subject: [PATCH 1/2] Backport Gitlab CI improvements from 13.0

---
 .gitlab-ci.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a85a9629..53e43c6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ services:
 
 stages:
   - build
+  - release
   - trigger
 
 variables:
@@ -15,7 +16,9 @@ variables:
 
 before_script:
   - RELEASE=$(echo $CI_COMMIT_REF_NAME | sed "s{.*\/\(.*\)\/.*{\1{g")
+  - RELEASE_DATE="$(date '+%Y-%m-%d')"
   - IMAGE_TAG=$(echo $CI_COMMIT_REF_SLUG | sed "s/^\([[:digit:]][[:digit:]]\)-\([[:digit:]]\)/\1\.\2/g")
+  - IMAGE_TAG_DATE="${IMAGE_TAG}-${RELEASE_DATE}"
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
 
 merge_request:
@@ -40,6 +43,20 @@ build:
     - docker build --pull -t $CONTAINER_IMAGE:$IMAGE_TAG -f Dockerfile-GitLab .
     - docker push $CONTAINER_IMAGE:$IMAGE_TAG
 
+release:
+  stage: release
+  variables:
+    GIT_STRATEGY: none
+  script:
+    - apk add python3
+    - docker pull registry.gitlab.com/hibou-io/hibou-odoo/flow
+    - docker tag registry.gitlab.com/hibou-io/hibou-odoo/flow flow
+    - docker run -v "${PWD}/.local:/dest" flow self-install /dest
+    - cd .local/flow
+    - ./entrypoint.sh docker-release $CONTAINER_IMAGE:$IMAGE_TAG $CONTAINER_IMAGE:$IMAGE_TAG_DATE
+  only:
+    - /^\d+\.\d+$/
+
 publish:
   stage: build
   script:

From a74b76c7db2334e8dabea7eac1eb13ddc4ca15ec Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Thu, 29 Oct 2020 13:17:42 -0700
Subject: [PATCH 2/2] [MIG] auditlog, purchase_exception,
 purchase_minimum_amount: from hibou-oca existing submodules

---
 auditlog                | 1 +
 purchase_exception      | 1 +
 purchase_minimum_amount | 1 +
 3 files changed, 3 insertions(+)
 create mode 120000 auditlog
 create mode 120000 purchase_exception
 create mode 120000 purchase_minimum_amount

diff --git a/auditlog b/auditlog
new file mode 120000
index 00000000..d456b705
--- /dev/null
+++ b/auditlog
@@ -0,0 +1 @@
+./external/hibou-oca/server-tools/auditlog
\ No newline at end of file
diff --git a/purchase_exception b/purchase_exception
new file mode 120000
index 00000000..25c41368
--- /dev/null
+++ b/purchase_exception
@@ -0,0 +1 @@
+./external/hibou-oca/purchase-workflow/purchase_exception
\ No newline at end of file
diff --git a/purchase_minimum_amount b/purchase_minimum_amount
new file mode 120000
index 00000000..72a12fcf
--- /dev/null
+++ b/purchase_minimum_amount
@@ -0,0 +1 @@
+./external/hibou-oca/purchase-workflow/purchase_minimum_amount
\ No newline at end of file