Skip to content

Commit

Permalink
TA#66731 [ADD][16.0] Initiate branch
Browse files Browse the repository at this point in the history
  • Loading branch information
majouda committed Jun 18, 2024
1 parent 0fd7de8 commit 62ef25a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 61 deletions.
24 changes: 1 addition & 23 deletions .docker_files/main/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,14 @@

{
"name": "Main Module",
"version": "14.0.1.0.0",
"version": "16.0.1.0.0",
"author": "Numigi",
"maintainer": "Numigi",
"website": "https://www.numigi.com",
"license": "LGPL-3",
"category": "Other",
"summary": "Install all addons required for testing.",
"depends": [
"disable_quick_create",
"google_attachment",
"resize_observer_error_catcher",
"web_contextual_search_favorite",
"web_custom_label",
"web_custom_modifier",
"web_editor_backend_context",
"web_favicon",
"web_form_disable_autocomplete",
"web_handle_condition",
"web_list_column_width",
"web_trash_condition",
"web_search_date_range",
"web_search_date_range_account",
"website_blog_internal",
"website_blog_rss_feed_disabled",
"website_geoip",
"website_google_analytics_fixed",
"website_landing_template",
"website_login_as",
"website_sale_wishlist_extended",
"website_slides_extended",
],
"installable": True,
}
2 changes: 1 addition & 1 deletion .docker_files/odoo.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test_report_directory = False
translate_modules = ['all']
unaccent = False
without_demo = False
workers = 2
workers = 0
xmlrpc = True
xmlrpc_interface =
xmlrpc_port = 8069
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: pre-commit
on:
pull_request:
branches:
- "14.0*"
- "16.0*"
push:
branches:
- "14.0"
- "16.0"

jobs:
pre-commit:
Expand Down
36 changes: 6 additions & 30 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,46 +1,22 @@
FROM quay.io/numigi/odoo-public:14.latest
MAINTAINER numigi <[email protected]>
FROM quay.io/numigi/odoo-public:16.latest
LABEL maintainer="[email protected]"

USER root
ARG GIT_TOKEN

COPY .docker_files/test-requirements.txt .
RUN pip3 install -r test-requirements.txt

ENV THIRD_PARTY_ADDONS /mnt/third-party-addons
RUN mkdir -p "${THIRD_PARTY_ADDONS}" && chown -R odoo "${THIRD_PARTY_ADDONS}"
COPY ./gitoo.yml /gitoo.yml
RUN gitoo install-all --conf_file /gitoo.yml --destination "${THIRD_PARTY_ADDONS}"
# ENV THIRD_PARTY_ADDONS /mnt/third-party-addons
# RUN mkdir -p "${THIRD_PARTY_ADDONS}" && chown -R odoo "${THIRD_PARTY_ADDONS}"
# COPY ./gitoo.yml /gitoo.yml
# RUN gitoo install-all --conf_file /gitoo.yml --destination "${THIRD_PARTY_ADDONS}"


COPY .docker_files/test-requirements.txt .
RUN pip3 install -r test-requirements.txt

USER odoo

COPY disable_quick_create /mnt/extra-addons/disable_quick_create
COPY google_attachment /mnt/extra-addons/google_attachment
COPY resize_observer_error_catcher /mnt/extra-addons/resize_observer_error_catcher
COPY web_contextual_search_favorite /mnt/extra-addons/web_contextual_search_favorite
COPY web_custom_label /mnt/extra-addons/web_custom_label
COPY web_custom_modifier /mnt/extra-addons/web_custom_modifier
COPY web_editor_backend_context /mnt/extra-addons/web_editor_backend_context
COPY web_favicon /mnt/extra-addons/web_favicon
COPY web_form_disable_autocomplete /mnt/extra-addons/web_form_disable_autocomplete
COPY web_handle_condition /mnt/extra-addons/web_handle_condition
COPY web_hide_db_manager_link /mnt/extra-addons/web_hide_db_manager_link
COPY web_list_column_width /mnt/extra-addons/web_list_column_width
COPY web_search_date_range /mnt/extra-addons/web_search_date_range
COPY web_search_date_range_account /mnt/extra-addons/web_search_date_range_account
COPY web_trash_condition /mnt/extra-addons/web_trash_condition
COPY website_blog_internal /mnt/extra-addons/website_blog_internal
COPY website_blog_rss_feed_disabled /mnt/extra-addons/website_blog_rss_feed_disabled
COPY website_geoip /mnt/extra-addons/website_geoip
COPY website_google_analytics_fixed /mnt/extra-addons/website_google_analytics_fixed
COPY website_landing_template /mnt/extra-addons/website_landing_template
COPY website_login_as /mnt/extra-addons/website_login_as
COPY website_sale_wishlist_extended /mnt/extra-addons/website_sale_wishlist_extended
COPY website_slides_extended /mnt/extra-addons/website_slides_extended

COPY .docker_files/main /mnt/extra-addons/main
COPY .docker_files/odoo.conf /etc/odoo
5 changes: 0 additions & 5 deletions gitoo.yml
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@

- url: https://github.com/Numigi/odoo-base-addons
branch: "14.0"
includes:
- test_http_request

0 comments on commit 62ef25a

Please sign in to comment.