Skip to content

Commit 5d7e011

Browse files
authored
Merge pull request #629 from Tecnativa/add-18.0-cont
Add 18.0 (continuation)
2 parents 3706d99 + fe2f6fc commit 5d7e011

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
# Test modern Odoo versions with latest Postgres version
38-
odoo_version: ["17.0"]
39-
pg_version: ["15"]
38+
odoo_version: ["18.0"]
39+
pg_version: ["16"]
4040
python_version: ["3.10"]
4141
include:
4242
# Older odoo versions don't support latest postgres and Python versions
43+
- odoo_version: "17.0"
44+
pg_version: "15"
45+
python_version: "3.10"
4346
- odoo_version: "16.0"
4447
pg_version: "14"
4548
python_version: "3.10"
@@ -103,6 +106,10 @@ jobs:
103106
DOCKER_REPO: tecnativa/doodba
104107
GHCR_HOST: ghcr.io
105108
steps:
109+
- name: Clean Docker system before build
110+
run: |
111+
docker system prune -af || true
112+
docker builder prune -af || true
106113
# Set build date as env variable to be used later
107114
- name: Set build date
108115
run: echo "BUILD_DATE=$(date '+%Y-%m-%dT%H:%M:%S.%N%:z')" >> $GITHUB_ENV
@@ -165,3 +172,7 @@ jobs:
165172
VCS_REF=${{ github.sha }}
166173
BUILD_DATE=${{ env.BUILD_DATE }}
167174
ODOO_VERSION=${{ matrix.odoo_version }}
175+
- name: Clean Docker system after build
176+
run: |
177+
docker system prune -af || true
178+
docker builder prune -af || true

tests/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def _check_addons(self, scaffolding_dir, odoo_skip):
197197

198198
def test_addons_filtered_lt_16(self):
199199
"""Test addons filtering with ``ONLY`` keyword in ``addons.yaml`` for versions < 16"""
200-
self._check_addons("dotd", {"16.0", "17.0"})
200+
self._check_addons("dotd", {"16.0", "17.0", "18.0"})
201201

202202
def test_addons_filtered_ge_16(self):
203203
"""Test addons filtering with ``ONLY`` keyword in ``addons.yaml`` for versions >= 16"""
@@ -335,7 +335,7 @@ def test_addons_env(self):
335335
("test", "-e", "auto/addons/crm"),
336336
("test", "-d", "auto/addons/crm/migrations"),
337337
)
338-
for sub_env in matrix(odoo_skip={"11.0", "12.0", "13.0", "17.0"}):
338+
for sub_env in matrix(odoo_skip={"11.0", "12.0", "13.0", "18.0"}):
339339
self.compose_test(
340340
join(SCAFFOLDINGS_DIR, "addons_env_ou"),
341341
sub_env,
@@ -416,7 +416,7 @@ def _check_dotd(self, scaffolding_dir, odoo_skip):
416416

417417
def test_dotd_lt_16(self):
418418
"""Test environment with common ``*.d`` directories for versions < 16."""
419-
self._check_dotd("dotd", {"16.0", "17.0"})
419+
self._check_dotd("dotd", {"16.0", "17.0", "18.0"})
420420

421421
def test_dotd_ge_16(self):
422422
"""Test environment with common ``*.d`` directories for versions >= 16."""
@@ -468,7 +468,7 @@ def _check_dependencies(self, scaffolding_dir, odoo_skip):
468468

469469
def test_dependencies_lt_16(self):
470470
"""Test dependencies installation for versions < 16"""
471-
self._check_dependencies("dependencies", {"16.0", "17.0"})
471+
self._check_dependencies("dependencies", {"16.0", "17.0", "18.0"})
472472

473473
def test_dependencies_ge_16(self):
474474
"""Test dependencies installation for versions >= 16"""
@@ -481,7 +481,7 @@ def test_dependencies_ge_16(self):
481481
def test_dependencies_base_search_fuzzy(self):
482482
"""Test dependencies installation."""
483483
dependencies_dir = join(SCAFFOLDINGS_DIR, "dependencies_base_search_fuzzy")
484-
for sub_env in matrix(odoo_skip={"17.0"}):
484+
for sub_env in matrix(odoo_skip={"17.0", "18.0"}):
485485
self.compose_test(
486486
dependencies_dir,
487487
sub_env,

0 commit comments

Comments
 (0)