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 25, 2024
1 parent d22312c commit ce324c1
Show file tree
Hide file tree
Showing 460 changed files with 54 additions and 10,064 deletions.
60 changes: 30 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,34 @@ jobs:
name: Setup Log Folder For Reports
command: sudo mkdir -p .log && sudo chmod 777 .log

- run:
name: Run Test
command: docker-compose run --rm odoo run_pytest.sh
# - run:
# name: Run Test
# command: docker-compose run --rm odoo run_pytest.sh

- run:
name: Codacy Coverage
command: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l python -r .log/coverage.xml
# - run:
# name: Codacy Coverage
# command: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l python -r .log/coverage.xml

- store_test_results:
path: .log
# - store_test_results:
# path: .log

# job that find the next tag for the current branch/repo and push the tag to github.
# it will trigger the publish of a new docker image.
auto-tag:
machine: true
steps:
- checkout
- run:
<<: *quay_io_login
- run:
name: Get nws
command: |
curl -L $NWS_BIN_LOCATION > ./nws
chmod +x ./nws
- run:
name: Set tag
command: |
./nws circleci create-tag -t odoo-base
# auto-tag:
# machine: true
# steps:
# - checkout
# - run:
# <<: *quay_io_login
# - run:
# name: Get nws
# command: |
# curl -L $NWS_BIN_LOCATION > ./nws
# chmod +x ./nws
# - run:
# name: Set tag
# command: |
# ./nws circleci create-tag -t odoo-base

workflows:
version: 2
Expand All @@ -57,10 +57,10 @@ workflows:
- tests:
context: quay.io

- auto-tag:
context: nws
requires:
- tests
filters:
branches:
only: /^1\d\.0/
# - auto-tag:
# context: nws
# requires:
# - tests
# filters:
# branches:
# only: /^1\d\.0/
2 changes: 1 addition & 1 deletion .docker_files/main/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# © 2022 Numigi (tm) and all its contributors (https://bit.ly/numigiens)
# © 2024 Numigi (tm) and all its contributors (https://bit.ly/numigiens)
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
39 changes: 2 additions & 37 deletions .docker_files/main/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# © 2022 Numigi (tm) and all its contributors (https://bit.ly/numigiens)
# © 2024 Numigi (tm) and all its contributors (https://bit.ly/numigiens)
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).

{
Expand All @@ -11,42 +11,7 @@
"category": "Other",
"summary": "Install all addons required for testing.",
"depends": [
"purchase", # For testing stock_orderpoint_scheduled_date
"product_category_safe_change",
"product_packaging_dimension_decimal",
"stock_account_visibility",
"stock_auto_assign_disabled",
"stock_auto_assign_disabled_jit",
"stock_change_qty_reason_enhanced",
"stock_immediate_transfer_disable",
"stock_location_dest_width",
"stock_location_position_alphanum",
"stock_move_location_domain_improved",
"stock_move_origin_link",
"stock_move_valuation_adjustment",
"stock_orderpoint_scheduled_date",
"stock_orderpoint_secondary_unit",
"stock_orderpoint_procurement_date",
"stock_picking_barcode",
"stock_picking_groupby_parent_affiliate",
"stock_picking_responsible_editable",
"stock_picking_secondary_unit_demand",
"stock_picking_show_address",
"stock_picking_split_qty",
"stock_picking_tracking_reference",
"stock_product_packaging_dimension",
"stock_product_packaging_uom",
"stock_production_lot_rma",
"stock_quant_by_category",
"stock_quant_secondary_unit",
"stock_rental",
"stock_replenish_report_secondary_unit",
"stock_route_optimized",
"stock_serial_single_quant",
"stock_special_route",
"stock_turnover_rate",
"stock_turnover_rate_purchase",
"stock_virtual_adjustment",
"stock",
],
"installable": True,
}
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
41 changes: 2 additions & 39 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM quay.io/numigi/odoo-public:14.latest
MAINTAINER numigi <contact@numigi.com>
FROM quay.io/numigi/odoo-public:16.latest
LABEL maintainer="contact@numigi.com"

USER root

Expand All @@ -18,42 +18,5 @@ RUN gitoo install-all --conf_file /gitoo.yml --destination "${THIRD_PARTY_ADDONS

USER odoo


COPY product_category_safe_change /mnt/extra-addons/product_category_safe_change
COPY product_packaging_dimension_decimal /mnt/extra-addons/product_packaging_dimension_decimal
COPY stock_account_visibility /mnt/extra-addons/stock_account_visibility
COPY stock_auto_assign_disabled /mnt/extra-addons/stock_auto_assign_disabled
COPY stock_auto_assign_disabled_jit /mnt/extra-addons/stock_auto_assign_disabled_jit
COPY stock_change_qty_reason_enhanced /mnt/extra-addons/stock_change_qty_reason_enhanced
COPY stock_immediate_transfer_disable /mnt/extra-addons/stock_immediate_transfer_disable
COPY stock_location_dest_width /mnt/extra-addons/stock_location_dest_width
COPY stock_location_position_alphanum /mnt/extra-addons/stock_location_position_alphanum
COPY stock_move_location_domain_improved /mnt/extra-addons/stock_move_location_domain_improved
COPY stock_move_origin_link /mnt/extra-addons/stock_move_origin_link
COPY stock_move_valuation_adjustment /mnt/extra-addons/stock_move_valuation_adjustment
COPY stock_orderpoint_scheduled_date /mnt/extra-addons/stock_orderpoint_scheduled_date
COPY stock_orderpoint_secondary_unit /mnt/extra-addons/stock_orderpoint_secondary_unit
COPY stock_orderpoint_procurement_date /mnt/extra-addons/stock_orderpoint_procurement_date
COPY stock_picking_barcode /mnt/extra-addons/stock_picking_barcode
COPY stock_picking_groupby_parent_affiliate /mnt/extra-addons/stock_picking_groupby_parent_affiliate
COPY stock_picking_responsible_editable /mnt/extra-addons/stock_picking_responsible_editable
COPY stock_picking_secondary_unit_demand /mnt/extra-addons/stock_picking_secondary_unit_demand
COPY stock_picking_show_address /mnt/extra-addons/stock_picking_show_address
COPY stock_picking_split_qty /mnt/extra-addons/stock_picking_split_qty
COPY stock_picking_tracking_reference /mnt/extra-addons/stock_picking_tracking_reference
COPY stock_product_packaging_dimension /mnt/extra-addons/stock_product_packaging_dimension
COPY stock_product_packaging_uom /mnt/extra-addons/stock_product_packaging_uom
COPY stock_production_lot_rma /mnt/extra-addons/stock_production_lot_rma
COPY stock_quant_by_category /mnt/extra-addons/stock_quant_by_category
COPY stock_quant_secondary_unit /mnt/extra-addons/stock_quant_secondary_unit
COPY stock_rental /mnt/extra-addons/stock_rental
COPY stock_replenish_report_secondary_unit /mnt/extra-addons/stock_replenish_report_secondary_unit
COPY stock_route_optimized /mnt/extra-addons/stock_route_optimized
COPY stock_serial_single_quant /mnt/extra-addons/stock_serial_single_quant
COPY stock_special_route /mnt/extra-addons/stock_special_route
COPY stock_turnover_rate /mnt/extra-addons/stock_turnover_rate
COPY stock_turnover_rate_purchase /mnt/extra-addons/stock_turnover_rate_purchase
COPY stock_virtual_adjustment /mnt/extra-addons/stock_virtual_adjustment

COPY .docker_files/main /mnt/extra-addons/main
COPY .docker_files/odoo.conf /etc/odoo
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
args:
- GIT_TOKEN=${GIT_TOKEN}
volumes:
- odoo-web-data:/var/lib/odoo
- odoo16-web-data:/var/lib/odoo
- ./.log:/var/log/odoo
ports:
- "8069:8069"
Expand All @@ -24,10 +24,10 @@ services:
- POSTGRES_USER=odoo
- PGDATA=/var/lib/postgresql/data/pgdata
volumes:
- odoo-db-data:/var/lib/postgresql/data/pgdata
- odoo16-db-data:/var/lib/postgresql/data/pgdata
expose:
- 5432

volumes:
odoo-web-data:
odoo-db-data:
odoo16-web-data:
odoo16-db-data:
33 changes: 13 additions & 20 deletions gitoo.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,52 @@
- url: https://{{GIT_TOKEN}}@github.com/numigi/odoo-base-addons
branch: "14.0"

- url: https://github.com/Numigi/odoo-partner-addons
branch: "14.0"
includes:
- partner_affiliate_extended

- url: https://github.com/OCA/account-financial-tools
branch: "14.0"
branch: "16.0"
includes:
- account_asset_management

- url: https://github.com/oca/queue
branch: "14.0"
- url: https://github.com/OCA/queue
branch: "16.0"
includes: ["queue_job"]

- url: https://github.com/oca/partner-contact
branch: "14.0"
- url: https://github.com/OCA/partner-contact
branch: "16.0"
includes:
- partner_affiliate

- url: https://github.com/OCA/product-attribute
branch: "14.0"
branch: "16.0"
includes:
- product_secondary_unit

- url: https://github.com/OCA/reporting-engine
branch: "14.0"
branch: "16.0"
includes:
- report_xlsx
- report_xlsx_helper # dependency of account_asset_management
- report_xlsx_helper

- url: https://github.com/OCA/sale-workflow
branch: "14.0"
branch: "16.0"
includes:
- sale_order_secondary_unit

- url: https://github.com/OCA/server-tools
branch: "14.0"
branch: "16.0"
includes:
- onchange_helper

- url: https://github.com/OCA/stock-logistics-warehouse
branch: "14.0"
branch: "16.0"
includes:
- stock_secondary_unit
- stock_change_qty_reason

- url: https://github.com/OCA/web
branch: "14.0"
branch: "16.0"
includes:
- web_widget_digitized_signature

- url: https://github.com/OCA/rma
branch: "14.0"
branch: "16.0"
includes:
- rma
- rma_sale
Expand Down
79 changes: 0 additions & 79 deletions product_category_safe_change/README.rst

This file was deleted.

4 changes: 0 additions & 4 deletions product_category_safe_change/__init__.py

This file was deleted.

17 changes: 0 additions & 17 deletions product_category_safe_change/__manifest__.py

This file was deleted.

Loading

0 comments on commit ce324c1

Please sign in to comment.