From 55bef5d5f9ed4826e98ab17e620136ae0ba9c4ae Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 3 Jul 2025 21:16:11 +0200 Subject: [PATCH] copier update --- .copier-answers.yml | 2 +- .github/workflows/test.yml | 10 +++++++--- .pre-commit-config.yaml | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 97e3544..de0edb3 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v4.3 +_commit: v4.8 _src_path: git@github.com:Noviat-CI/addons-repo-template.git ci_disable_autoinstall_modules: account_asset odoo_test_flavor: Both diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f95ed2c..38b2266 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: name: test with Odoo Enterprise odoo_enterprise : 1 exclude_modules : "account_asset" - makepot: true + makepot: "true" services: postgres: image: postgres:12.0 @@ -80,7 +80,11 @@ jobs: mkdir -p ${{ env.INSTALL_ADDONS_DIR }}/setup find $(realpath $ADDONS_DIR) $(realpath ${{ env.ADDITIONAL_ADDONS_DIR }}) -name __manifest__.py -exec sh -c 'ln -s "$(dirname "$0")" "${{ env.INSTALL_ADDONS_DIR }}"' {} \; find $(realpath $ADDONS_DIR) $(realpath ${{ env.ADDITIONAL_ADDONS_DIR }}) -iwholename '*/setup/*/setup.py' -exec sh -c 'ln -s "$(dirname "$0")" "${{ env.INSTALL_ADDONS_DIR }}/setup"' {} \; +<<<<<<< before updating if [ -n ${{ matrix.exclude }} ] +======= + if [ -n ${{ matrix.exclude}} ] +>>>>>>> after updating then remove_excluded_modules ${{ env.INSTALL_ADDONS_DIR }} ${{ matrix.exclude }} fi @@ -93,10 +97,10 @@ jobs: run: | echo "ADDONS_PATH=/opt/odoo/addons,${{ env.INSTALL_ADDONS_DIR }}" >> $GITHUB_ENV - name: Add addons to EXCLUDE PATH - if: ${{ env.EXCLUDE_MODULES }} + if: ${{ matrix.EXCLUDE_MODULES }} run: | echo "server_wide_modules = web,module_change_auto_install" >> ${ODOO_RC} - echo "modules_auto_install_disabled = $EXCLUDE_MODULES" >> ${ODOO_RC} + echo "ODOO_MODULES_AUTO_INSTALL_DISABLED=${{ matrix.EXCLUDE_MODULES }}" >> $GITHUB_ENV - name: Install addons and dependencies run: | (ADDONS_PATH=${ADDONS_PATH} ADDONS_DIR=${INSTALL_ADDONS_DIR} oca_install_addons) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8c943c8..1cc78e2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,6 +38,10 @@ repos: entry: found a en.po file language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' + - repo: https://github.com/sbidoul/whool + rev: v1.2 + hooks: + - id: whool-init - repo: https://github.com/oca/maintainer-tools rev: bf9ecb9938b6a5deca0ff3d870fbd3f33341fded hooks: @@ -45,6 +49,7 @@ repos: - id: oca-update-pre-commit-excluded-addons - id: oca-fix-manifest-website args: ["https://www.noviat.com/"] + - id: oca-gen-external-dependencies - id: oca-gen-addons-table - repo: https://github.com/OCA/odoo-pre-commit-hooks rev: v0.0.33