Skip to content

Commit

Permalink
[FIX] Add ninja and patchelf to apt dependencies
Browse files Browse the repository at this point in the history
- remove pip==23.3.1 from pip dependencies
- test_dotb and test_addons_filtered
- test_dependencies_base_search_fuzzy skiped because is not migrated to 17.0 yet
  • Loading branch information
josep-tecnativa committed Nov 14, 2023
1 parent f5e6992 commit 7365ace
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ jobs:
odoo_version: ["17.0"]
pg_version: ["15"]
python_version: ["3.10"]
include:
# Older odoo versions don't support latest postgres and Python versions
- odoo_version: "16.0"
pg_version: "14"
python_version: "3.10"
- odoo_version: "15.0"
pg_version: "14"
python_version: "3.9"
- odoo_version: "14.0"
pg_version: "14"
python_version: "3.9"
- odoo_version: "13.0"
pg_version: "14"
python_version: "3.9"
env:
# Indicates what's the equivalent to tecnativa/doodba:latest image
LATEST_RELEASE: "17.0"
Expand All @@ -54,8 +68,6 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version }}
- name: DF
run: df -h
# Install dev and test dependencies
- run: pip install poetry
- name: Patch $PATH
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
"[dockerfile]": {
"editor.formatOnSave": false
},
"python.analysis.extraPaths": ["./lib", "./tests"]
"python.analysis.extraPaths": ["./lib", "./tests"],
"python.languageServer": "None"
}
4 changes: 2 additions & 2 deletions tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def compose_test(self, workdir, sub_env, *commands):
def test_addons_filtered(self):
"""Test addons filtering with ``ONLY`` keyword in ``addons.yaml``."""
project_dir = join(SCAFFOLDINGS_DIR, "dotd")
for sub_env in matrix(odoo_skip={"17.0"}):
for sub_env in matrix():
self.compose_test(
project_dir,
dict(sub_env, DBNAME="prod"),
Expand Down Expand Up @@ -367,7 +367,7 @@ def test_addons_env_double(self):

def test_dotd(self):
"""Test environment with common ``*.d`` directories."""
for sub_env in matrix(odoo_skip={"17.0"}):
for sub_env in matrix():
self.compose_test(
join(SCAFFOLDINGS_DIR, "dotd"),
sub_env,
Expand Down
2 changes: 2 additions & 0 deletions tests/scaffoldings/dotd/custom/dependencies/apt.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This line should be ignored
busybox
ruby
ninja-build
patchelf

0 comments on commit 7365ace

Please sign in to comment.