Skip to content

Commit

Permalink
Merge branch 'master' into custom
Browse files Browse the repository at this point in the history
  • Loading branch information
huguesdk committed Dec 6, 2024
2 parents ddc96ea + 196eb07 commit fa24652
Show file tree
Hide file tree
Showing 17 changed files with 726 additions and 512 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: "3.12"
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ jobs:
fail-fast: false
matrix:
include:
- odoo-version: 11.0
python-version: 3.6
machine: ubuntu-20.04
- odoo-version: 12.0
python-version: 3.6
machine: ubuntu-20.04
- odoo-version: 13.0
python-version: 3.8
machine: ubuntu-22.04
Expand All @@ -35,9 +29,12 @@ 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
- uses: actions/checkout@v4
- name: Install poetry
run: pipx install poetry

Expand Down
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@ var/
*.egg
*.eggs

# Windows installers
*.msi

# Debian packages
*.deb

# Redhat packages
*.rpm

# MacOS packages
*.dmg
*.pkg

# Installer logs
pip-log.txt
pip-delete-this-directory.txt
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.yml
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ This template allows to bootstrap and update addon repositories for these Odoo v
- 15.0
- 16.0
- 17.0
- 18.0

Future versions will be added as they are released. Past versions could be added as long
as they don't break existing branches.
Expand Down
9 changes: 8 additions & 1 deletion copier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ _min_copier_version: "9"

_tasks:
- rm -f {% if ci != "Travis" %}.travis.yml{% endif %} .t2d.yml
- "{% if odoo_version >= 18 %}rm -f .prettierrc.yml .eslintrc.yml{% endif %}"

_migrations:
- version: v1.3.6
Expand All @@ -13,7 +14,7 @@ _migrations:

odoo_version:
type: float
default: 17.0
default: 18.0
choices:
- 10.0
- 11.0
Expand All @@ -23,6 +24,7 @@ odoo_version:
- 15.0
- 16.0
- 17.0
- 18.0
help: Which Odoo version are we deploying in this branch?

org_slug:
Expand Down Expand Up @@ -152,6 +154,11 @@ include_wkhtmltopdf:
Do you need to install wkhtmltopdf? Usually only needed if you're going to test PDF
report generation.

enable_checklog_odoo:
type: bool
default: "{% if odoo_version < 18.0 -%}no{% else %}yes{% endif %}"
help: Do you want to make tests fail on warnings?

github_enforce_dev_status_compatibility:
type: bool
default: yes
Expand Down
Loading

0 comments on commit fa24652

Please sign in to comment.