[FIX] try another ci fix

coopiteasy · Jan 25, 2024 · 100edde · 100edde
1 parent afb60f8
commit 100edde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,20 +18,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-            # remytms: there is a circular dependency with
-            # provelo_analytic and csv_export_*
-            # Adding provelo_analytic_account is a work around until
-            # a real fix will be done.
           - container: ghcr.io/oca/oca-ci/py3.6-ocb12.0:latest
-            include: "provelo_analytic_account,foodhub_copy_product_fields,foodhub_custom,foodhub_custom_product_kanban_view,foodhub_label_custom,foodhub_product_fields"
+            include: "foodhub_copy_product_fields,foodhub_custom,foodhub_custom_product_kanban_view,foodhub_label_custom,foodhub_product_fields"
             name: test with OCB
             makepot: "true"
           - container: ghcr.io/oca/oca-ci/py3.6-ocb12.0:latest
-            include: "provelo_analytic_account,provelo_custom,provelo_custom_display_phone,provelo_custom_invoice_auto_open,provelo_custom_timesheet_ui,provelo_resource_activity_reports"
+            include: "provelo_custom,provelo_custom_display_phone,provelo_custom_invoice_auto_open,provelo_custom_timesheet_ui,provelo_resource_activity_reports"
             name: test with OCB
             makepot: "true"
           - container: ghcr.io/oca/oca-ci/py3.6-ocb12.0:latest
-            exclude: "foodhub_copy_product_fields,foodhub_custom,foodhub_custom_product_kanban_view,foodhub_label_custom,foodhub_product_fields,provelo_custom,provelo_custom_display_phone,provelo_custom_invoice_auto_open,provelo_custom_timesheet_ui,provelo_resource_activity_reports"
+            exclude: "foodhub_copy_product_fields,foodhub_custom,foodhub_custom_product_kanban_view,foodhub_label_custom,foodhub_product_fields,provelo_analytic_account,provelo_custom,provelo_custom_display_phone,provelo_custom_invoice_auto_open,provelo_custom_timesheet_ui,provelo_resource_activity_reports"
             name: test with OCB
             makepot: "true"
     services:

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -32,6 +32,11 @@ git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/company_supplie
 git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/account_customer_wallet
 git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/pos_customer_wallet
 git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/portal_customer_wallet
+# this is needed because csv_export_invoice depends on
+# provelo_analytic_account. although this modules comes from this repository,
+# the "install addons and dependencies" ci step fails if this is not listed
+# here.
+git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/provelo_analytic_account
 git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/hr_auto_manager_group_membership
 git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/website_sale_product_availability
 git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/csv_export_base