diff --git a/.github/workflows/aggregate.yml b/.github/workflows/aggregate.yml new file mode 100644 index 000000000000..6a84fd5f89bc --- /dev/null +++ b/.github/workflows/aggregate.yml @@ -0,0 +1,94 @@ +name: Aggregate fork branches + +on: + push: + branches: + - ledoent + - "19.0-fix-*" + workflow_dispatch: + +permissions: + contents: write + +jobs: + aggregate: + runs-on: ubuntu-latest + steps: + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Install git-aggregator + run: pip install git-aggregator==4.1 + + - name: Configure git identity (gitaggregate needs this before merging) + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + + - name: Checkout fork (no working tree needed; gitaggregate clones fresh) + uses: actions/checkout@v4 + with: + ref: ledoent + path: fork-meta + fetch-depth: 1 + + - name: Write aggregate config + # gitaggregate clones into ./openupgrade so the lab's repos.yaml layout is reproduced. + # `target ledoent aggregated` is what gets pushed back. + run: | + cat > aggregate.yml <<'YAML' + ./openupgrade: + defaults: + depth: 500 + remotes: + origin: https://github.com/OCA/OpenUpgrade.git + ledoent: https://github.com/ledoent/OpenUpgrade.git + target: ledoent aggregated + merges: + - ledoent ledoent + - ledoent 19.0-fix-user-groups-id-rename + # 19.0-fix-rollup is a conflict-resolved combination of the five + # OCA/OpenUpgrade PRs #5628-5632 (cherry-picked onto origin/19.0 + # in dependency order). Listing them individually here fails + # because #5628 and #5630 both touch hr/19.0.1.1/pre-migration.py + # with non-overlapping additions that gitaggregate's straight + # `git pull --no-rebase` can't auto-merge. When any OCA PR + # changes, rebase the rollup branch. + - ledoent 19.0-fix-rollup + YAML + + - name: Run gitaggregate + run: gitaggregate -c aggregate.yml + + - name: Force-push aggregated + id: push + working-directory: openupgrade + env: + PUSH_TOKEN: ${{ secrets.AGGREGATE_PUSH_TOKEN || secrets.GITHUB_TOKEN }} + run: | + git remote set-url ledoent "https://x-access-token:${PUSH_TOKEN}@github.com/ledoent/OpenUpgrade.git" + git push --force ledoent HEAD:refs/heads/aggregated + sha=$(git rev-parse HEAD) + echo "Aggregated head: $sha" + echo "sha=$sha" >> "$GITHUB_OUTPUT" + + - name: Trigger build-image workflow + # GITHUB_TOKEN-driven branch pushes don't fire downstream workflows + # (loop protection). Use repository_dispatch with a PAT so build-image + # can react. Falls back to no-op if AGGREGATE_PUSH_TOKEN is unset. + env: + GH_TOKEN: ${{ secrets.AGGREGATE_PUSH_TOKEN }} + run: | + if [ -z "$GH_TOKEN" ]; then + echo "AGGREGATE_PUSH_TOKEN not set; skipping repository_dispatch." + echo "Run \`gh workflow run build-image.yml --ref aggregated\` manually." + exit 0 + fi + gh api \ + -X POST \ + "/repos/${{ github.repository }}/dispatches" \ + -f event_type=aggregated-updated \ + -f "client_payload[sha]=${{ steps.push.outputs.sha }}" + echo "Fired repository_dispatch event_type=aggregated-updated" diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml new file mode 100644 index 000000000000..3b684ed68606 --- /dev/null +++ b/.github/workflows/build-image.yml @@ -0,0 +1,58 @@ +name: Build openupgrade image + +# Builds an Odoo 19 image with the aggregated OpenUpgrade tree baked in +# and pushes to the ledoent Zot registry at registry.hz.ledoweb.com. +# +# Auth: basic-auth via the `robot-ci` Zot user. +# Secrets: ZOT_USERNAME (= robot-ci), ZOT_PASSWORD (set on this repo). +# +# Image: registry.hz.ledoweb.com/openupgrade/openupgrade +# Consumed by: openupgrade-lab/docker-compose.yml (odoo-19 service) + +on: + push: + branches: + - aggregated + repository_dispatch: + types: [aggregated-updated] + workflow_dispatch: + +concurrency: + group: build-image-${{ github.ref }} + cancel-in-progress: true + +env: + ZOT_HOST: registry.hz.ledoweb.com + ZOT_IMAGE: registry.hz.ledoweb.com/openupgrade/openupgrade + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + with: + ref: aggregated + fetch-depth: 1 + + - uses: docker/login-action@v3 + with: + registry: ${{ env.ZOT_HOST }} + username: ${{ secrets.ZOT_USERNAME }} + password: ${{ secrets.ZOT_PASSWORD }} + + - uses: docker/setup-buildx-action@v3 + + - name: Build and push (amd64 only — cluster is amd64; M-series uses Rosetta) + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile.openupgrade + push: true + platforms: linux/amd64 + tags: | + ${{ env.ZOT_IMAGE }}:latest + ${{ env.ZOT_IMAGE }}:${{ github.sha }} + cache-from: type=registry,ref=${{ env.ZOT_IMAGE }}:buildcache + cache-to: type=registry,ref=${{ env.ZOT_IMAGE }}:buildcache,mode=max diff --git a/.github/workflows/documentation-commit.yml b/.github/workflows/documentation-commit.yml index c7d445ee6521..84842b18ecf6 100644 --- a/.github/workflows/documentation-commit.yml +++ b/.github/workflows/documentation-commit.yml @@ -8,10 +8,15 @@ name: Build and commit documentation on: push: + branches: ["19.0"] paths: ["docsource/modules180-190.rst"] jobs: documentation-commit: + # Docs publishing only makes sense on OCA upstream (default branch + # publishes to https://oca.github.io/OpenUpgrade/). Forks don't have + # a `documentation` branch — checkout would fail. Restrict to OCA. + if: ${{ github.repository_owner == 'OCA' }} runs-on: ubuntu-latest steps: - name: Check out OpenUpgrade Documentation diff --git a/.github/workflows/mirror-upstream.yml b/.github/workflows/mirror-upstream.yml new file mode 100644 index 000000000000..7d1819a4dc17 --- /dev/null +++ b/.github/workflows/mirror-upstream.yml @@ -0,0 +1,62 @@ +name: Mirror upstream OCA/OpenUpgrade + +on: + schedule: + - cron: "0 6 * * *" # daily 06:00 UTC + workflow_dispatch: + +permissions: + contents: write + +jobs: + mirror: + runs-on: ubuntu-latest + steps: + - name: Checkout fork + uses: actions/checkout@v4 + with: + ref: ledoent + fetch-depth: 0 + token: ${{ secrets.GIT_PUSH_TOKEN || secrets.GITHUB_TOKEN }} + + - name: Fetch upstream + run: | + git remote add upstream https://github.com/OCA/OpenUpgrade.git + git fetch upstream 19.0 + + - name: Force-push upstream/19.0 to fork's 19.0 + run: | + git push origin "upstream/19.0:refs/heads/19.0" --force-with-lease || \ + git push origin "upstream/19.0:refs/heads/19.0" --force + + - name: Check whether ledoent has drifted from upstream/19.0 + id: drift + run: | + # ledoent should be upstream/19.0 + custom-CI commits. If a merge-base + # comparison shows ledoent missing upstream commits, we need a rebase. + if git merge-base --is-ancestor upstream/19.0 ledoent; then + echo "drift=no" >> "$GITHUB_OUTPUT" + echo "ledoent is up to date with upstream/19.0" + else + echo "drift=yes" >> "$GITHUB_OUTPUT" + behind=$(git rev-list --count ledoent..upstream/19.0) + echo "ledoent is behind upstream/19.0 by $behind commits — rebase needed" + fi + + - name: Open issue if drift detected + if: steps.drift.outputs.drift == 'yes' + uses: actions/github-script@v7 + with: + script: | + const { owner, repo } = context.repo; + const title = 'ledoent branch needs rebase onto upstream/19.0'; + const existing = await github.rest.issues.listForRepo({ + owner, repo, labels: 'mirror-drift', state: 'open' + }); + if (existing.data.length === 0) { + await github.rest.issues.create({ + owner, repo, title, + labels: ['mirror-drift'], + body: 'upstream OCA/OpenUpgrade `19.0` has advanced. Rebase `ledoent` onto it and force-push.\n\n```bash\ngit fetch origin\ngit checkout ledoent\ngit rebase origin/19.0\ngit push -f origin ledoent\n```' + }); + } diff --git a/.github/workflows/test-migration.yml b/.github/workflows/test-migration.yml index bc425add5de4..46da397ffc28 100644 --- a/.github/workflows/test-migration.yml +++ b/.github/workflows/test-migration.yml @@ -13,6 +13,10 @@ on: branches: - "19.0" - "19.0-ocabot-*" + - "19.0-mig-*" + - "19.0-fix-*" + - "aggregated" + - "ledoent" jobs: test: @@ -23,7 +27,9 @@ jobs: DB_PASSWORD: "odoo" DB_PORT: 5432 DB_USERNAME: "odoo" - DOWNLOADS: https://github.com/${{github.repository}}/releases/download/databases + # Test databases live only on OCA upstream; forks reuse them so we + # don't have to mirror multi-GB psql dumps. + DOWNLOADS: https://github.com/OCA/OpenUpgrade/releases/download/databases ODOO: "./odoo/odoo-bin" PGHOST: "localhost" PGPASSWORD: "odoo" diff --git a/Dockerfile.openupgrade b/Dockerfile.openupgrade new file mode 100644 index 000000000000..5d946f732c28 --- /dev/null +++ b/Dockerfile.openupgrade @@ -0,0 +1,34 @@ +## Image: registry.ledoweb.com/openupgrade +## +## Built by .github/workflows/build-image.yml on every push to `aggregated`. +## Contains: +## - Odoo 19.0 base +## - Python deps the openupgrade-lab uses (s3fs, redis, sentry-sdk, etc.) +## - The full `aggregated` checkout of this repo as /opt/openupgrade +## The lab's docker-compose mounts the openupgradelib source over the +## pip-installed lib so it can hot-swap during development. + +FROM odoo:19.0 + +USER root + +# git needed for the openupgradelib install (no pinned PyPI release yet for 19.0). +RUN apt-get update && \ + apt-get install -y --no-install-recommends git && \ + rm -rf /var/lib/apt/lists/* + +RUN pip install --no-cache-dir --break-system-packages \ + fsspec>=2025.3.0 \ + s3fs \ + packaging \ + python-json-logger \ + redis \ + sentry-sdk \ + python-slugify \ + plaid-python \ + cssselect \ + "git+https://github.com/OCA/openupgradelib@master" + +COPY --chown=odoo:odoo . /opt/openupgrade + +USER odoo diff --git a/docsource/modules180-190.rst b/docsource/modules180-190.rst index 39d37c51049d..cd1bffcc8743 100644 --- a/docsource/modules180-190.rst +++ b/docsource/modules180-190.rst @@ -8,13 +8,13 @@ Module coverage 18.0 -> 19.0 +===================================================+======================+=================================================+ | account |Done | | +---------------------------------------------------+----------------------+-------------------------------------------------+ -| account_check_printing | | | +| account_check_printing |Done |Nothing to do | +---------------------------------------------------+----------------------+-------------------------------------------------+ -| account_debit_note | | | +| account_debit_note |Done |Nothing to do | +---------------------------------------------------+----------------------+-------------------------------------------------+ | account_edi | |No DB layout changes. | +---------------------------------------------------+----------------------+-------------------------------------------------+ -| account_edi_proxy_client | | | +| account_edi_proxy_client |Done |Nothing to do | +---------------------------------------------------+----------------------+-------------------------------------------------+ | account_edi_ubl_cii | | | +---------------------------------------------------+----------------------+-------------------------------------------------+ @@ -26,7 +26,7 @@ Module coverage 18.0 -> 19.0 +---------------------------------------------------+----------------------+-------------------------------------------------+ | account_peppol | | | +---------------------------------------------------+----------------------+-------------------------------------------------+ -| |new| account_peppol_advanced_fields | | | +| |new| account_peppol_advanced_fields |Done |Nothing to do | +---------------------------------------------------+----------------------+-------------------------------------------------+ | account_qr_code_emv | |No DB layout changes. | +---------------------------------------------------+----------------------+-------------------------------------------------+ diff --git a/openupgrade_scripts/scripts/account_check_printing/19.0.1.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/account_check_printing/19.0.1.0/upgrade_analysis_work.txt new file mode 100644 index 000000000000..ef948eead08b --- /dev/null +++ b/openupgrade_scripts/scripts/account_check_printing/19.0.1.0/upgrade_analysis_work.txt @@ -0,0 +1,8 @@ +---Models in module 'account_check_printing'--- + +---Fields in module 'account_check_printing'--- +account_check_printing / account.payment / check_layout_available (boolean): NEW hasdefault: default, stored: False + +# NOTHING TO DO + +---XML records in module 'account_check_printing'--- diff --git a/openupgrade_scripts/scripts/account_debit_note/19.0.1.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/account_debit_note/19.0.1.0/upgrade_analysis_work.txt new file mode 100644 index 000000000000..d008128e7d33 --- /dev/null +++ b/openupgrade_scripts/scripts/account_debit_note/19.0.1.0/upgrade_analysis_work.txt @@ -0,0 +1,8 @@ +---Models in module 'account_debit_note'--- + +---Fields in module 'account_debit_note'--- + +---XML records in module 'account_debit_note'--- +DEL ir.actions.server: account_debit_note.action_move_debit_note + +# NOTHING TO DO diff --git a/openupgrade_scripts/scripts/account_edi_proxy_client/19.0.1.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/account_edi_proxy_client/19.0.1.0/upgrade_analysis_work.txt new file mode 100644 index 000000000000..a6160b53e365 --- /dev/null +++ b/openupgrade_scripts/scripts/account_edi_proxy_client/19.0.1.0/upgrade_analysis_work.txt @@ -0,0 +1,9 @@ +---Models in module 'account_edi_proxy_client'--- + +---Fields in module 'account_edi_proxy_client'--- +account_edi_proxy_client / account_edi_proxy_client.user / is_token_out_of_sync (boolean): NEW +account_edi_proxy_client / account_edi_proxy_client.user / token_sync_version (integer) : NEW + +# NOTHING TO DO + +---XML records in module 'account_edi_proxy_client'--- diff --git a/openupgrade_scripts/scripts/account_peppol_advanced_fields/19.0.1.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/account_peppol_advanced_fields/19.0.1.0/upgrade_analysis_work.txt new file mode 100644 index 000000000000..0fb776246104 --- /dev/null +++ b/openupgrade_scripts/scripts/account_peppol_advanced_fields/19.0.1.0/upgrade_analysis_work.txt @@ -0,0 +1,17 @@ +---Models in module 'account_peppol_advanced_fields'--- + +---Fields in module 'account_peppol_advanced_fields'--- +account_peppol_advanced_fields / account.move / peppol_accounting_cost (char) : NEW +account_peppol_advanced_fields / account.move / peppol_additional_document_reference (char): NEW +account_peppol_advanced_fields / account.move / peppol_contract_document_reference (char): NEW +account_peppol_advanced_fields / account.move / peppol_delivery_location_id (char): NEW +account_peppol_advanced_fields / account.move / peppol_despatch_document_reference (char): NEW +account_peppol_advanced_fields / account.move / peppol_originator_document_reference (char): NEW +account_peppol_advanced_fields / account.move / peppol_project_reference (char): NEW + +# NOTHING TO DO + +---XML records in module 'account_peppol_advanced_fields'--- +NEW ir.ui.view: account_peppol_advanced_fields.view_move_form_inherit_peppol + +# NOTHING TO DO diff --git a/openupgrade_scripts/scripts/base/19.0.1.3/pre-migration.py b/openupgrade_scripts/scripts/base/19.0.1.3/pre-migration.py index 39b145615b4b..699de5d46ed7 100644 --- a/openupgrade_scripts/scripts/base/19.0.1.3/pre-migration.py +++ b/openupgrade_scripts/scripts/base/19.0.1.3/pre-migration.py @@ -176,3 +176,48 @@ def migrate(env, version): openupgrade.rename_xmlids(env.cr, _renamed_xmlids) openupgrade.rename_xmlids(env.cr, _merged_xmlids, allow_merge=True) openupgrade.rename_fields(env, _renamed_fields) + _fix_user_groups_id_references(env) + + +def _fix_user_groups_id_references(env): + """rename_fields() renames the field column on res_users and quoted + references in ir.filters.domain, but it does not process ir.rule + domain_force, nor does it match unquoted dotted references like + ``user.groups_id.ids`` in Python-evaluated domain expressions. + + Concretely, an ir.rule with + domain_force = "[('groups_id', 'in', user.groups_id.ids)]" + has its LHS migrated to 'group_ids' but the RHS is left untouched, + so any view referencing the rule crashes at runtime with + ``AttributeError: 'res.users' object has no attribute 'groups_id'``. + """ + openupgrade.logged_query( + env.cr, + r""" + UPDATE ir_rule + SET domain_force = regexp_replace( + domain_force, '\muser\.groups_id\M', 'user.group_ids', 'g' + ) + WHERE domain_force ~ '\muser\.groups_id\M' + """, + ) + openupgrade.logged_query( + env.cr, + r""" + UPDATE ir_filters + SET domain = regexp_replace( + domain, '\muser\.groups_id\M', 'user.group_ids', 'g' + ) + WHERE domain ~ '\muser\.groups_id\M' + """, + ) + openupgrade.logged_query( + env.cr, + r""" + UPDATE ir_act_server + SET code = regexp_replace( + code, '\muser\.groups_id\M', 'user.group_ids', 'g' + ) + WHERE code ~ '\muser\.groups_id\M' + """, + )