From 7e618807581b2bd393369fa160e3d6ce4a9fb184 Mon Sep 17 00:00:00 2001
From: damien clochard <damien@dalibo.info>
Date: Wed, 12 Aug 2020 06:39:57 +0000
Subject: [PATCH 1/2] [CI] skip build on debian stretch

---
 .gitlab-ci.yml | 81 +++++++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95d2ebd..6849720 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ variables:
 stages:
   - lint
   - build
+  - test
   - deploy
 
 image: postgres:13
@@ -57,11 +58,12 @@ lint-markdown:
 ## B U I L D
 ##
 
-make9:
+
+make12:
   stage: build
-  image: postgres:9.6
+  image: postgres:12
   script:
-    - apt-get update && apt-get install -y make postgresql-plpython3-9.6 postgresql-server-dev-9.6 python3-pip
+    - apt-get update && apt-get install -y make postgresql-plpython3-12 git postgresql-server-dev-12 python3-pip
     - pip3 install -r requirements.txt
     - make extension
     - make install
@@ -73,11 +75,11 @@ make9:
         - results/
     expire_in: 1 day
 
-make10:
+make13:
   stage: build
-  image: postgres:10
+  image: postgres:13
   script:
-    - apt-get update && apt-get install -y make postgresql-plpython3-10 postgresql-server-dev-10 python3-pip
+    - apt-get update && apt-get install -y make postgresql-plpython3-13 postgresql-server-dev-13 python3-pip
     - pip3 install -r requirements.txt
     - make extension
     - make install
@@ -89,13 +91,34 @@ make10:
         - results/
     expire_in: 1 day
 
-make11:
+make11-centos:
   stage: build
-  image: postgres:11
+  image: centos:7
+  before_script:
+    - echo 'ignoring global before_script'
   script:
-    - apt-get update && apt-get install -y make postgresql-plpython3-11 postgresql-server-dev-11 python3-pip
+    - yum -y install https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-7-x86_64/pgdg-centos11-11-2.noarch.rpm
+    - yum -y install git make postgresql-plpython3-11 postgresql11 postgresql11-server postgresql11-devel pgxnclient python-setuptools python3-pip
+    - /usr/pgsql-11/bin/pg_config
+    - export PATH="$PATH:/usr/pgsql-11/bin"
     - pip3 install -r requirements.txt
-    - make extension
+    - cd /tmp
+    - git clone https://gitlab.com/dalibo/postgresq_faker.git faker
+    - cd faker
+    - make
+    - make install
+  when: manual
+
+##
+##  T E S T
+##
+test9:
+  stage: test
+  image: postgres:9.6
+  script:
+    - apt-get update && apt-get install -y make postgresql-plpython3-9.6 postgresql-server-dev-9.6 python3-pip
+    - pip3 install -r requirements.txt
+    #- make extension
     - make install
     - make installcheck || diff results tests/expected
   artifacts:
@@ -105,13 +128,13 @@ make11:
         - results/
     expire_in: 1 day
 
-make12:
-  stage: build
-  image: postgres:12
+test10:
+  stage: test
+  image: postgres:10
   script:
-    - apt-get update && apt-get install -y make postgresql-plpython3-12 git postgresql-server-dev-12 python3-pip
+    - apt-get update && apt-get install -y make postgresql-plpython3-10 postgresql-server-dev-10 python3-pip
     - pip3 install -r requirements.txt
-    - make extension
+    #- make extension
     - make install
     - make installcheck || diff results tests/expected
   artifacts:
@@ -121,13 +144,13 @@ make12:
         - results/
     expire_in: 1 day
 
-make13:
-  stage: build
-  image: postgres:13
+test11:
+  stage: test
+  image: postgres:11
   script:
-    - apt-get update && apt-get install -y make postgresql-plpython3-13 postgresql-server-dev-13 python3-pip
+    - apt-get update && apt-get install -y make postgresql-plpython3-11 postgresql-server-dev-11 python3-pip
     - pip3 install -r requirements.txt
-    - make extension
+    #- make extension
     - make install
     - make installcheck || diff results tests/expected
   artifacts:
@@ -137,24 +160,6 @@ make13:
         - results/
     expire_in: 1 day
 
-make11-centos:
-  stage: build
-  image: centos:7
-  before_script:
-    - echo 'ignoring global before_script'
-  script:
-    - yum -y install https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-7-x86_64/pgdg-centos11-11-2.noarch.rpm
-    - yum -y install git make postgresql-plpython3-11 postgresql11 postgresql11-server postgresql11-devel pgxnclient python-setuptools python3-pip
-    - /usr/pgsql-11/bin/pg_config
-    - export PATH="$PATH:/usr/pgsql-11/bin"
-    - pip3 install -r requirements.txt
-    - cd /tmp
-    - git clone https://gitlab.com/dalibo/postgresq_faker.git faker
-    - cd faker
-    - make
-    - make install
-  when: manual
-
 
 ##
 ## D E P L O Y
-- 
GitLab


From a2593867d0d32d08d7a951a6b633f54e197e3be2 Mon Sep 17 00:00:00 2001
From: damien clochard <damien@dalibo.info>
Date: Wed, 12 Aug 2020 06:56:54 +0000
Subject: [PATCH 2/2] [CI] fixup build path

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6849720..a811c68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,7 +70,7 @@ make12:
     - make installcheck || diff results tests/expected
   artifacts:
     paths:
-        - build
+        - _build/
         - regression.*
         - results/
     expire_in: 1 day
@@ -86,7 +86,7 @@ make13:
     - make installcheck || diff results tests/expected
   artifacts:
     paths:
-        - build
+        - _build/
         - regression.*
         - results/
     expire_in: 1 day
@@ -123,7 +123,7 @@ test9:
     - make installcheck || diff results tests/expected
   artifacts:
     paths:
-        - build
+        - _build/
         - regression.*
         - results/
     expire_in: 1 day
@@ -139,7 +139,7 @@ test10:
     - make installcheck || diff results tests/expected
   artifacts:
     paths:
-        - build
+        - _build/
         - regression.*
         - results/
     expire_in: 1 day
@@ -155,7 +155,7 @@ test11:
     - make installcheck || diff results tests/expected
   artifacts:
     paths:
-        - build
+        - _build/
         - regression.*
         - results/
     expire_in: 1 day
@@ -204,7 +204,7 @@ pgxn:
     - make pgxn
   artifacts:
     paths:
-      - build
+      - _build/
       - _pgxn/
     expire_in: 1 day
   only:
-- 
GitLab