Skip to content

Commit

Permalink
Merge pull request #54 from sbidoul/add-odoo17
Browse files Browse the repository at this point in the history 
Add Odoo 17 builds
  • Loading branch information
@sbidoul
sbidoul authored Nov 7, 2023
2 parents 2201e9c + 4194d9f commit 9a08dbc
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 5 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,112 +21,144 @@ jobs:
include:
# odoo/odoo
- python_version: "2.7"
codename: focal
odoo_version: "8.0"
odoo_org_repo: "odoo/odoo"
virtualenv_constraint: "<20.22"
image_name: py2.7-odoo8.0
- python_version: "2.7"
codename: focal
odoo_version: "9.0"
odoo_org_repo: "odoo/odoo"
virtualenv_constraint: "<20.22"
image_name: py2.7-odoo9.0
- python_version: "2.7"
codename: focal
odoo_version: "10.0"
odoo_org_repo: "odoo/odoo"
virtualenv_constraint: "<20.22"
image_name: py2.7-odoo10.0
- python_version: "3.5"
codename: focal
odoo_version: "11.0"
odoo_org_repo: "odoo/odoo"
virtualenv_constraint: "<20.22"
image_name: py3.5-odoo11.0
- python_version: "3.6"
codename: focal
odoo_version: "12.0"
odoo_org_repo: "odoo/odoo"
setuptools_constraint: "<58" # vatnumber needs setuptools with 2to3 support
virtualenv_constraint: "<20.22"
image_name: py3.6-odoo12.0
- python_version: "3.6"
codename: focal
odoo_version: "13.0"
odoo_org_repo: "odoo/odoo"
setuptools_constraint: "<58" # vatnumber needs setuptools with 2to3 support
virtualenv_constraint: "<20.22"
image_name: py3.6-odoo13.0
- python_version: "3.6"
codename: focal
odoo_version: "14.0"
odoo_org_repo: "odoo/odoo"
virtualenv_constraint: "<20.22"
image_name: py3.6-odoo14.0
- python_version: "3.8"
codename: focal
odoo_version: "14.0"
odoo_org_repo: "odoo/odoo"
image_name: py3.8-odoo14.0
- python_version: "3.8"
codename: focal
odoo_version: "15.0"
odoo_org_repo: "odoo/odoo"
image_name: py3.8-odoo15.0
- python_version: "3.9"
codename: focal
odoo_version: "15.0"
odoo_org_repo: "odoo/odoo"
image_name: py3.9-odoo15.0
- python_version: "3.10"
codename: jammy
odoo_version: "16.0"
odoo_org_repo: "odoo/odoo"
image_name: py3.10-odoo16.0
- python_version: "3.10"
codename: jammy
odoo_version: "17.0"
odoo_org_repo: "odoo/odoo"
image_name: py3.10-odoo17.0
# oca/ocb
- python_version: "2.7"
codename: focal
odoo_version: "8.0"
odoo_org_repo: "oca/ocb"
virtualenv_constraint: "<20.22"
image_name: py2.7-ocb8.0
- python_version: "2.7"
codename: focal
odoo_version: "9.0"
odoo_org_repo: "oca/ocb"
virtualenv_constraint: "<20.22"
image_name: py2.7-ocb9.0
- python_version: "2.7"
codename: focal
odoo_version: "10.0"
odoo_org_repo: "oca/ocb"
virtualenv_constraint: "<20.22"
image_name: py2.7-ocb10.0
- python_version: "3.5"
codename: focal
odoo_version: "11.0"
odoo_org_repo: "oca/ocb"
virtualenv_constraint: "<20.22"
image_name: py3.5-ocb11.0
- python_version: "3.6"
codename: focal
odoo_version: "12.0"
odoo_org_repo: "oca/ocb"
setuptools_constraint: "<58" # vatnumber needs setuptools with 2to3 support
virtualenv_constraint: "<20.22"
image_name: py3.6-ocb12.0
- python_version: "3.6"
codename: focal
odoo_version: "13.0"
odoo_org_repo: "oca/ocb"
setuptools_constraint: "<58" # vatnumber needs setuptools with 2to3 support
virtualenv_constraint: "<20.22"
image_name: py3.6-ocb13.0
- python_version: "3.6"
codename: focal
odoo_version: "14.0"
odoo_org_repo: "oca/ocb"
virtualenv_constraint: "<20.22"
image_name: py3.6-ocb14.0
- python_version: "3.8"
codename: focal
odoo_version: "14.0"
odoo_org_repo: "oca/ocb"
image_name: py3.8-ocb14.0
- python_version: "3.8"
codename: focal
odoo_version: "15.0"
odoo_org_repo: "oca/ocb"
image_name: py3.8-ocb15.0
- python_version: "3.9"
codename: focal
odoo_version: "15.0"
odoo_org_repo: "oca/ocb"
image_name: py3.9-ocb15.0
- python_version: "3.10"
codename: jammy
odoo_version: "16.0"
odoo_org_repo: "oca/ocb"
image_name: py3.10-ocb16.0
- python_version: "3.10"
codename: jammy
odoo_version: "17.0"
odoo_org_repo: "oca/ocb"
image_name: py3.10-ocb17.0
services:
postgres:
image: postgres:9.6
Expand All @@ -149,6 +181,7 @@ jobs:
uses: docker/build-push-action@v3
with:
build-args: |
codename=${{ matrix.codename }}
python_version=${{ matrix.python_version }}
odoo_version=${{ matrix.odoo_version }}
odoo_org_repo=${{ matrix.odoo_org_repo }}
Expand All @@ -171,6 +204,7 @@ jobs:
uses: docker/build-push-action@v3
with:
build-args: |
codename=${{ matrix.codename }}
python_version=${{ matrix.python_version }}
odoo_version=${{ matrix.odoo_version }}
odoo_org_repo=${{ matrix.odoo_org_repo }}
Expand Down
18 changes: 13 additions & 5 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,23 @@ RUN apt-get update -qq \
expect-dev

# Install wkhtml
RUN curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.$(lsb_release -c -s)_amd64.deb -o /tmp/wkhtml.deb \
RUN case $(lsb_release -c -s) in \
focal) WKHTML_DEB_URL=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.focal_amd64.deb ;; \
jammy) WKHTML_DEB_URL=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb ;; \
esac \
&& curl -sSL $WKHTML_DEB_URL -o /tmp/wkhtml.deb \
&& apt-get update -qq \
&& dpkg --force-depends -i /tmp/wkhtml.deb \
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -f --no-install-recommends \
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends /tmp/wkhtml.deb \
&& rm /tmp/wkhtml.deb

# Install nodejs dependencies
RUN curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo "deb https://deb.nodesource.com/node_15.x `lsb_release -c -s` main" > /etc/apt/sources.list.d/nodesource.list \
RUN case $(lsb_release -c -s) in \
focal) NODE_SOURCE="deb https://deb.nodesource.com/node_15.x focal main" \
&& curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - ;; \
jammy) NODE_SOURCE="deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg ;; \
esac \
&& echo "$NODE_SOURCE" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq nodejs
# less is for odoo<12
Expand Down

0 comments on commit 9a08dbc

Please sign in to comment.