From cfb45a426dc3cbc6300af2770d359e82658371d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@gmail.com>
Date: Thu, 26 Sep 2024 15:33:58 +0200
Subject: [PATCH 1/2] Build Odoo 18 images

---
 .github/workflows/ci.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d5bb5e3..144340a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -62,6 +62,11 @@ jobs:
             odoo_version: "17.0"
             odoo_org_repo: "odoo/odoo"
             image_name: py3.10-odoo17.0
+          - python_version: "3.10"
+            codename: jammy
+            odoo_version: "18.0"
+            odoo_org_repo: "odoo/odoo"
+            image_name: py3.10-odoo18.0
           # oca/ocb
           - python_version: "3.6"
             codename: focal
@@ -105,6 +110,11 @@ jobs:
             odoo_version: "17.0"
             odoo_org_repo: "oca/ocb"
             image_name: py3.10-ocb17.0
+          - python_version: "3.10"
+            codename: jammy
+            odoo_version: "18.0"
+            odoo_org_repo: "oca/ocb"
+            image_name: py3.10-ocb18.0
     services:
       postgres:
         image: postgres:9.6

From 9ca0a6e954a5814e5c65ffb0fa0c7c548edd89be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@gmail.com>
Date: Thu, 26 Sep 2024 15:49:28 +0200
Subject: [PATCH 2/2] ci: upgrade to postgres 12

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 144340a..1b1e1f9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -117,7 +117,7 @@ jobs:
             image_name: py3.10-ocb18.0
     services:
       postgres:
-        image: postgres:9.6
+        image: postgres:12
         env:
           POSTGRES_USER: odoo
           POSTGRES_PASSWORD: odoo