From 46a09edcac340bd514d4f10542063d6f828ade2a Mon Sep 17 00:00:00 2001
From: Simone Rubino <simone.rubino@aion-tech.it>
Date: Thu, 26 Sep 2024 16:08:49 +0200
Subject: [PATCH] Add version 18

---
 .github/workflows/test.yml                                     | 3 +++
 copier.yml                                                     | 3 ++-
 .../workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 57dbf149..bf5dd913 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,9 @@ jobs:
           - odoo-version: 17.0
             python-version: "3.10"
             machine: ubuntu-22.04
+          - odoo-version: 18.0
+            python-version: "3.12"
+            machine: ubuntu-24.04
     steps:
       # Prepare environment
       - uses: actions/checkout@v3
diff --git a/copier.yml b/copier.yml
index a4022ab9..3afc9609 100644
--- a/copier.yml
+++ b/copier.yml
@@ -13,7 +13,7 @@ _migrations:
 
 odoo_version:
   type: float
-  default: 17.0
+  default: 18.0
   choices:
     - 10.0
     - 11.0
@@ -23,6 +23,7 @@ odoo_version:
     - 15.0
     - 16.0
     - 17.0
+    - 18.0
   help: Which Odoo version are we deploying in this branch?
 
 org_slug:
diff --git a/src/.github/workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja b/src/.github/workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja
index 00528a7d..b2528565 100644
--- a/src/.github/workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja	
+++ b/src/.github/workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja	
@@ -12,6 +12,7 @@ on:
 {%
 set IMAGES = {
   "odoo": {
+    18.0: "ghcr.io/oca/oca-ci/py3.10-odoo18.0:latest",
     17.0: "ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest",
     16.0: "ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest",
     15.0: "ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest",
@@ -22,6 +23,7 @@ set IMAGES = {
     10.0: "ghcr.io/oca/oca-ci/py2.7-odoo10.0:latest",
   },
   "ocb": {
+    18.0: "ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest",
     17.0: "ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest",
     16.0: "ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest",
     15.0: "ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest",