Merge pull request #629 from Tecnativa/add-18.0-cont

Add 18.0 (continuation)
Tecnativa · Oct 9, 2024 · 5d7e011 · 5d7e011
2 parents 3706d99 + fe2f6fc
commit 5d7e011
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -35,11 +35,14 @@ jobs:
       fail-fast: false
       matrix:
         # Test modern Odoo versions with latest Postgres version
-        odoo_version: ["17.0"]
-        pg_version: ["15"]
+        odoo_version: ["18.0"]
+        pg_version: ["16"]
         python_version: ["3.10"]
         include:
           # Older odoo versions don't support latest postgres and Python versions
+          - odoo_version: "17.0"
+            pg_version: "15"
+            python_version: "3.10"
           - odoo_version: "16.0"
             pg_version: "14"
             python_version: "3.10"
@@ -103,6 +106,10 @@ jobs:
       DOCKER_REPO: tecnativa/doodba
       GHCR_HOST: ghcr.io
     steps:
+      - name: Clean Docker system before build
+        run: |
+          docker system prune -af || true
+          docker builder prune -af || true
       # Set build date as env variable to be used later
       - name: Set build date
         run: echo "BUILD_DATE=$(date '+%Y-%m-%dT%H:%M:%S.%N%:z')" >> $GITHUB_ENV
@@ -165,3 +172,7 @@ jobs:
             VCS_REF=${{ github.sha }}
             BUILD_DATE=${{ env.BUILD_DATE }}
             ODOO_VERSION=${{ matrix.odoo_version }}
+      - name: Clean Docker system after build
+        run: |
+          docker system prune -af || true
+          docker builder prune -af || true
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -197,7 +197,7 @@ def _check_addons(self, scaffolding_dir, odoo_skip):
 
     def test_addons_filtered_lt_16(self):
         """Test addons filtering with ``ONLY`` keyword in ``addons.yaml`` for versions < 16"""
-        self._check_addons("dotd", {"16.0", "17.0"})
+        self._check_addons("dotd", {"16.0", "17.0", "18.0"})
 
     def test_addons_filtered_ge_16(self):
         """Test addons filtering with ``ONLY`` keyword in ``addons.yaml`` for versions >= 16"""
@@ -335,7 +335,7 @@ def test_addons_env(self):
                 ("test", "-e", "auto/addons/crm"),
                 ("test", "-d", "auto/addons/crm/migrations"),
             )
-        for sub_env in matrix(odoo_skip={"11.0", "12.0", "13.0", "17.0"}):
+        for sub_env in matrix(odoo_skip={"11.0", "12.0", "13.0", "18.0"}):
             self.compose_test(
                 join(SCAFFOLDINGS_DIR, "addons_env_ou"),
                 sub_env,
@@ -416,7 +416,7 @@ def _check_dotd(self, scaffolding_dir, odoo_skip):
 
     def test_dotd_lt_16(self):
         """Test environment with common ``*.d`` directories for versions < 16."""
-        self._check_dotd("dotd", {"16.0", "17.0"})
+        self._check_dotd("dotd", {"16.0", "17.0", "18.0"})
 
     def test_dotd_ge_16(self):
         """Test environment with common ``*.d`` directories for versions >= 16."""
@@ -468,7 +468,7 @@ def _check_dependencies(self, scaffolding_dir, odoo_skip):
 
     def test_dependencies_lt_16(self):
         """Test dependencies installation for versions < 16"""
-        self._check_dependencies("dependencies", {"16.0", "17.0"})
+        self._check_dependencies("dependencies", {"16.0", "17.0", "18.0"})
 
     def test_dependencies_ge_16(self):
         """Test dependencies installation for versions >= 16"""
@@ -481,7 +481,7 @@ def test_dependencies_ge_16(self):
     def test_dependencies_base_search_fuzzy(self):
         """Test dependencies installation."""
         dependencies_dir = join(SCAFFOLDINGS_DIR, "dependencies_base_search_fuzzy")
-        for sub_env in matrix(odoo_skip={"17.0"}):
+        for sub_env in matrix(odoo_skip={"17.0", "18.0"}):
             self.compose_test(
                 dependencies_dir,
                 sub_env,