From 18d21f462b475cb4032abf71915bd0063e03d864 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 17 Oct 2020 16:36:03 +0000
Subject: [PATCH 1/7] [FIX] .gitmodules file

---
 .gitmodules | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 5309e9a7..562103ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,4 +19,3 @@
 [submodule "external/hibou-shipbox"]
 	path = external/hibou-shipbox
 	url = https://gitlab.com/hibou-io/hibou-odoo/shipbox.git
->>>>>>> .gitmodules

From 1e9c0ddb7699c78a644ee2f4b5fe2204202bc3a5 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 17 Oct 2020 14:34:29 -0700
Subject: [PATCH 2/7] Add hibou flow docker-release for dated build on major
 version builds.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 962d818b..91239ea3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ services:
 
 stages:
   - build
+  - release
   - trigger
 
 variables:
@@ -15,6 +16,7 @@ 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")
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
 
@@ -41,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:$RELEASE_DATE
+  only:
+    - /^\d+\.\d+$/
+
 publish:
   stage: build
   script:

From e23e2557149c9e81c279f5db34d3aa4980297cb7 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 17 Oct 2020 14:39:10 -0700
Subject: [PATCH 3/7] [FIX] major build tag

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91239ea3..d94e835b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ 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:
@@ -53,7 +54,7 @@ release:
     - 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:$RELEASE_DATE
+    - ./entrypoint.sh docker-release $CONTAINER_IMAGE:$IMAGE_TAG $CONTAINER_IMAGE:$IMAGE_TAG_DATE
   only:
     - /^\d+\.\d+$/
 

From 65c977cfc0fe7c6a0edc6566bc3db542f3c15dd3 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 17 Oct 2020 14:44:42 -0700
Subject: [PATCH 4/7] [FIX] typo in build variable

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d94e835b..ca5e6653 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ 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"
+  - IMAGE_TAG_DATE:"${IMAGE_TAG}-${RELEASE_DATE}"
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
 
 merge_request:

From 5bb3bcb7024c794e34ac1288b6275745efacd70f Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 17 Oct 2020 14:50:00 -0700
Subject: [PATCH 5/7] [FIX] env variable for release date

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca5e6653..68def3bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ 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}"
+  - IMAGE_TAG_DATE="${IMAGE_TAG}-${RELEASE_DATE}"
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
 
 merge_request:

From d12cf3f1c008b7cf78363902b02e70683bc26eec Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 17 Oct 2020 15:10:29 -0700
Subject: [PATCH 6/7] Port Gitlab CI improvements from 12.0

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68def3bd..53e43c6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,11 +35,10 @@ merge_request:
     - docker run $ENVS flow gitlab-automerge --remove-source
 
 build:
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   stage: build
   script:
-    - apk add git
-    - git submodule sync --recursive
-    - git submodule update --init --recursive
     - sed -i "s/RELEASE/$RELEASE/g" Dockerfile-GitLab
     - docker build --pull -t $CONTAINER_IMAGE:$IMAGE_TAG -f Dockerfile-GitLab .
     - docker push $CONTAINER_IMAGE:$IMAGE_TAG

From 137d0620a37eb4bc9a6c285f9e650b8320681579 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Wed, 21 Oct 2020 09:54:20 -0700
Subject: [PATCH 7/7] [MIG] queue_job: from upstream OCA submodule

---
 .gitmodules              | 3 +++
 external/hibou-oca/queue | 1 +
 queue_job                | 1 +
 queue_job_cron           | 1 +
 queue_job_subscribe      | 1 +
 5 files changed, 7 insertions(+)
 create mode 160000 external/hibou-oca/queue
 create mode 120000 queue_job
 create mode 120000 queue_job_cron
 create mode 120000 queue_job_subscribe

diff --git a/.gitmodules b/.gitmodules
index 562103ad..73c65265 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "external/hibou-shipbox"]
 	path = external/hibou-shipbox
 	url = https://gitlab.com/hibou-io/hibou-odoo/shipbox.git
+[submodule "external/hibou-oca/queue"]
+	path = external/hibou-oca/queue
+	url = https://github.com/hibou-io/oca-queue.git
diff --git a/external/hibou-oca/queue b/external/hibou-oca/queue
new file mode 160000
index 00000000..a089cb18
--- /dev/null
+++ b/external/hibou-oca/queue
@@ -0,0 +1 @@
+Subproject commit a089cb18d591f6e7b24bd32fc1db8655526b1419
diff --git a/queue_job b/queue_job
new file mode 120000
index 00000000..bf3ebe44
--- /dev/null
+++ b/queue_job
@@ -0,0 +1 @@
+./external/hibou-oca/queue/queue_job
\ No newline at end of file
diff --git a/queue_job_cron b/queue_job_cron
new file mode 120000
index 00000000..8dfd2d47
--- /dev/null
+++ b/queue_job_cron
@@ -0,0 +1 @@
+./external/hibou-oca/queue/queue_job_cron
\ No newline at end of file
diff --git a/queue_job_subscribe b/queue_job_subscribe
new file mode 120000
index 00000000..3c9f9bd1
--- /dev/null
+++ b/queue_job_subscribe
@@ -0,0 +1 @@
+./external/hibou-oca/queue/queue_job_subscribe
\ No newline at end of file