Commit 6fa9d25a authored by kaiyou's avatar kaiyou
Browse files

Prepare build for 12.0

parent 5739218a
Pipeline #657 failed with stage
in 8 minutes and 26 seconds
......@@ -14,23 +14,23 @@ build:
# - docker push $CI_REGISTRY_IMAGE:9.0
# - docker build --build-arg ODOO_VERSION=10.0 --tag $CI_REGISTRY_IMAGE:10.0 .
# - docker push $CI_REGISTRY_IMAGE:10.0
- docker build --build-arg ODOO_VERSION=11.0 --tag $CI_REGISTRY_IMAGE:11.0 .
- docker push $CI_REGISTRY_IMAGE:11.0
# - docker build --build-arg ODOO_VERSION=11.0 --tag $CI_REGISTRY_IMAGE:11.0 .
# - docker push $CI_REGISTRY_IMAGE:11.0
- docker build --build-arg ODOO_VERSION=12.0 --tag $CI_REGISTRY_IMAGE:11.0 .
- docker push $CI_REGISTRY_IMAGE:12.0
- docker build --build-arg ODOO_VERSION=13.0 --tag $CI_REGISTRY_IMAGE:11.0 .
- docker push $CI_REGISTRY_IMAGE:13.0
# - docker build --build-arg ODOO_VERSION=13.0 --tag $CI_REGISTRY_IMAGE:11.0 .
# - docker push $CI_REGISTRY_IMAGE:13.0
- cd ../upgrade/
# - docker build --build-arg ODOO_VERSION=9.0 --tag $CI_REGISTRY_IMAGE:9.0-upgrade .
# - docker push $CI_REGISTRY_IMAGE:9.0-upgrade
# - docker build --build-arg ODOO_VERSION=10.0 --tag $CI_REGISTRY_IMAGE:10.0-upgrade .
# - docker push $CI_REGISTRY_IMAGE:10.0-upgrade
- docker build --build-arg ODOO_VERSION=11.0 --tag $CI_REGISTRY_IMAGE:11.0-upgrade .
- docker push $CI_REGISTRY_IMAGE:11.0-upgrade
# - docker build --build-arg ODOO_VERSION=11.0 --tag $CI_REGISTRY_IMAGE:11.0-upgrade .
# - docker push $CI_REGISTRY_IMAGE:11.0-upgrade
- docker build --build-arg ODOO_VERSION=12.0 --tag $CI_REGISTRY_IMAGE:11.0-upgrade .
- docker push $CI_REGISTRY_IMAGE:12.0-upgrade
- docker build --build-arg ODOO_VERSION=13.0 --tag $CI_REGISTRY_IMAGE:11.0-upgrade .
- docker push $CI_REGISTRY_IMAGE:13.0-upgrade
# - docker build --build-arg ODOO_VERSION=13.0 --tag $CI_REGISTRY_IMAGE:11.0-upgrade .
# - docker push $CI_REGISTRY_IMAGE:13.0-upgrade
......@@ -7,25 +7,24 @@ account-payment:
account-financial-reporting:
- account_financial_report
- account_tax_balance
- customer_activity_statement
- customer_outstanding_statement
- partner_statement
account-financial-tools:
- account_chart_update
- account_check_deposit
- account_group_menu
- account_tag_menu
- account_type_menu
- account_fiscal_year
- account_menu
account-analytic:
- account_analytic_parent
bank-statement-import:
- account_bank_statement_import_paypal
- account_bank_statement_import_qif
- account_bank_statement_import_online
- account_bank_statement_import_ofx
- account_bank_statement_import_split
currency:
- currency_rate_update
server-brand:
- disable_odoo_online
- res_config_settings_enterprise_remove
- remove_odoo_enterprise
event:
- partner_event
web:
......@@ -39,27 +38,18 @@ website:
- website_media_size
- website_odoo_debranding
- website_snippet_anchor
- website_snippet_timeline
- website_snipper_preset
- website_analytics_piwik
website-themes:
- website_theme_flexible
pos:
- pos_config_show_accounting
- pos_order_mgmt
- pos_session_pay_invoice
vertical-association:
- membership_extension
- membership_initial_fee
- membership_prorate
- membership_variable_period
server-ux:
- base_optional_quick_create
- base_technical_features
- mass_editing
reporting-engine:
- report_py3o
- report_py3o_fusion_server
- report_xlsx
- report_fillpdf
- report_xlsx_helper
......@@ -8,13 +8,3 @@
merges:
- origin $ODOO_VERSION
- odoo $ODOO_VERSION
reporting-engine:
defaults:
depth: $DEPTH_MERGE
remotes:
origin: https://forge.tedomum.net/tedomum/odoo-reporting-engine.git
target: origin $ODOO_VERSION
merges:
- origin $ODOO_VERSION
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment