From f6ad42449a560942aea3f79ab9a7aa550bcef7f3 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 22 Aug 2023 18:31:51 +0200 Subject: [PATCH 01/21] plone606 --- CHANGELOG.md | 2 ++ versions.cfg | 66 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a25b53..90d909b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ## Unreleased +- Upgrade Plone 6.0.4 -> 6.0.6 [mamico] + - redturtle.volto 5.0.0 -> 5.0.1 [mamico] - Custom portal url in @@fix-links [mamico] diff --git a/versions.cfg b/versions.cfg index 9a39828..1bf8684 100644 --- a/versions.cfg +++ b/versions.cfg @@ -1,7 +1,8 @@ [buildout] extends = - https://dist.plone.org/release/6.0.4/versions.cfg - https://dist.plone.org/release/6.0.4/versions-ecosystem.cfg + https://dist.plone.org/release/6.0.6/versions.cfg + https://dist.plone.org/release/6.0.6/versions-ecosystem.cfg + https://dist.plone.org/release/6.0.6/versions-extra.cfg [iocomune] version = __CURRENT_VERSION__ @@ -28,12 +29,15 @@ collective.volto.subsites = 1.4.0 collective.z3cform.datagridfield = 3.0.1 design.plone.contenttypes = 6.0.15 design.plone.policy = 5.0.5 -iw.rejectanonymous = 1.2.7 eea.api.taxonomy = 1.5 +et-xmlfile = 1.1.0 geographiclib = 1.50 geopy = 1.21.0 +iw.rejectanonymous = 1.2.7 kitconcept.seo = 2.0.1 +openpyxl = 3.1.2 plone.formwidget.geolocation = 2.2.1 +pycountry = 19.8.18 redturtle.bandi = 1.4.3 redturtle.faq = 1.0.1 redturtle.rssservice = 2.2.0 @@ -61,9 +65,59 @@ node.ext.ugm = 1.0 plone.formwidget.contenttree = 1.2.0 plone.patternslib = 1.3.0 plone.restapi = 8.41.0 -pycountry = 19.8.18 -openpyxl = 3.1.2 -et-xmlfile = 1.1.0 + +# io-cittadino +fonttools = 4.39.3 +pyphen = 0.14.0 +pyphen = 0.14.0 +Brotli = 1.0.9 +cssselect2 = 0.7.0 +html5lib = 1.1 +pydyf = 0.6.0 +tinycss2 = 1.2.1 +zopfli = 0.2.2 +webencodings = 0.5.1 +pdfkit = 1.0.0 +weasyprint = 58.1 + +# wsgi +dataflake.wsgi.bjoern = 2.0 +# apt install libev-dev +# yum install libev-devel +bjoern = 3.2.2 + +# Relstorage +RelStorage = 3.5.0 +psycopg2 = 2.9.6 +perfmetrics = 3.3.0 + +# LDAP +pas.plugins.ldap = 1.8.2 +yafowil.yaml = 2.0 +yafowil.widget.dict = 1.8 +yafowil.widget.array = 1.7 +yafowil.plone = 4.0.0a5 +yafowil = 3.1.0 +python-ldap = 3.4.3 +five.globalrequest = 99.1 +bda.cache = 1.3.0 +node = 1.2.1 +pyasn1-modules = 0.3.0 +pyasn1 = 0.5.0 +passlib = 1.7.4 +python-memcached = 1.59 + +# buildout +plone.recipe.haproxy = 2.0.0 +plone.recipe.zeoserver = 2.0.3 +z3c.recipe.usercrontab = 1.5 +zope.mkzeoinstance = 5.0 +collective.recipe.backup = 4.2.0 +zc.recipe.cmmi = 3.0.0 +plone.recipe.varnish = 6.0.11 +collective.recipe.template = 2.2 +collective.recipe.cmd = 0.11 +click = 8.1.3 # do not fix these (?) setuptools= From ed211358d731e6bffdffaa2aa7e55c342e618e0d Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 22 Aug 2023 18:34:22 +0200 Subject: [PATCH 02/21] collective.exportimport=1.7 --- versions.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.cfg b/versions.cfg index 1bf8684..5020566 100644 --- a/versions.cfg +++ b/versions.cfg @@ -10,6 +10,7 @@ version = __CURRENT_VERSION__ [versions] # agid-related products collective.address = 1.6 +collective.exportimport = 1.7 collective.feedback = 1.0.0 collective.geolocationbehavior = 1.7.1 collective.honeypot = 2.1 From 2e5bb1f35e11a35279e6afd1ea931eb816784dee Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 22 Aug 2023 18:41:07 +0200 Subject: [PATCH 03/21] pin --- versions.cfg | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/versions.cfg b/versions.cfg index 5020566..b323c61 100644 --- a/versions.cfg +++ b/versions.cfg @@ -34,6 +34,9 @@ eea.api.taxonomy = 1.5 et-xmlfile = 1.1.0 geographiclib = 1.50 geopy = 1.21.0 +haufe.requestmonitoring = 0.6.0 +hurry.filesize = 0.9 +ijson = 3.1.4 iw.rejectanonymous = 1.2.7 kitconcept.seo = 2.0.1 openpyxl = 3.1.2 @@ -41,6 +44,7 @@ plone.formwidget.geolocation = 2.2.1 pycountry = 19.8.18 redturtle.bandi = 1.4.3 redturtle.faq = 1.0.1 +redturtle.filesretriever = 1.0.0 redturtle.rssservice = 2.2.0 redturtle.volto = 5.0.1 redturtle.voltoplugin.editablefooter = 1.1.2 @@ -67,6 +71,10 @@ plone.formwidget.contenttree = 1.2.0 plone.patternslib = 1.3.0 plone.restapi = 8.41.0 +# dev +Products.ZMIntrospection = 1.0 +experimental.gracefulblobmissing = 1.0 + # io-cittadino fonttools = 4.39.3 pyphen = 0.14.0 @@ -81,6 +89,15 @@ webencodings = 0.5.1 pdfkit = 1.0.0 weasyprint = 58.1 +# io-prenoto +pyexcel-ods3 = 0.6.1 +pyexcel-ezodf = 0.3.4 +pyexcel-io = 0.6.6 +pyexcel-xlsx = 0.6.0 +lml = 0.1.0 +pyinter = 0.2.0 +collective.contentrules.mailfromfield = 1.2.1 + # wsgi dataflake.wsgi.bjoern = 2.0 # apt install libev-dev From b5a9b934a9655c3fc0ad026ceeae7e2a9803f91a Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 5 Sep 2023 14:40:52 +0200 Subject: [PATCH 04/21] plone.dexterity 3.0.3 --- versions.cfg | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/versions.cfg b/versions.cfg index b323c61..8ec10cd 100644 --- a/versions.cfg +++ b/versions.cfg @@ -8,6 +8,12 @@ extends = version = __CURRENT_VERSION__ [versions] +# plone products (maybe need to be removed when upgrading plone versions) +plone.formwidget.contenttree = 1.2.0 +plone.patternslib = 1.3.0 +plone.restapi = 8.41.0 +plone.dexterity = 3.0.3 + # agid-related products collective.address = 1.6 collective.exportimport = 1.7 @@ -66,11 +72,6 @@ odict = 1.9.0 pas.plugins.ldap = 1.8.2 node.ext.ugm = 1.0 -# plone products (maybe need to be removed when upgrading plone versions) -plone.formwidget.contenttree = 1.2.0 -plone.patternslib = 1.3.0 -plone.restapi = 8.41.0 - # dev Products.ZMIntrospection = 1.0 experimental.gracefulblobmissing = 1.0 From 93faf21545a0b3b53ded45652127df23774c3ef4 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 22 Sep 2023 17:19:48 +0200 Subject: [PATCH 05/21] plone 6.0.7 --- versions.cfg | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/versions.cfg b/versions.cfg index 75dca3d..5460da0 100644 --- a/versions.cfg +++ b/versions.cfg @@ -1,8 +1,8 @@ [buildout] extends = - https://dist.plone.org/release/6.0.6/versions.cfg - https://dist.plone.org/release/6.0.6/versions-ecosystem.cfg - https://dist.plone.org/release/6.0.6/versions-extra.cfg + https://dist.plone.org/release/6.0.7/versions.cfg + https://dist.plone.org/release/6.0.7/versions-ecosystem.cfg + https://dist.plone.org/release/6.0.7/versions-extra.cfg [iocomune] version = __CURRENT_VERSION__ @@ -11,8 +11,6 @@ version = __CURRENT_VERSION__ # plone products (maybe need to be removed when upgrading plone versions) plone.formwidget.contenttree = 1.2.0 plone.patternslib = 1.3.0 -plone.restapi = 8.41.0 -plone.dexterity = 3.0.3 # agid-related products collective.address = 1.6 From 9b82098580b720ff4bfd3e243a212a653a492d3c Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 22 Sep 2023 17:21:22 +0200 Subject: [PATCH 06/21] changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fb6bda..10ae112 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,13 @@ # Changelog +## Unreleased + +- Upgrade Plone 6.0.4 -> 6.0.7 [mamico] + ## 20230824-01 -- Upgrade Plone 6.0.4 -> 6.0.6 [mamico] - redturtle.volto 5.0.0 -> 5.0.1 [mamico] - Custom portal url in @@fix-links [mamico] From f18386ae2f6923d2f646d03d5153dad187df56e5 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 26 Sep 2023 15:51:17 +0200 Subject: [PATCH 07/21] workaround https://github.com/plone/Products.CMFPlone/issues/3848 --- versions.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/versions.cfg b/versions.cfg index b2e6a40..62f8dc7 100644 --- a/versions.cfg +++ b/versions.cfg @@ -7,8 +7,16 @@ extends = [iocomune] version = __CURRENT_VERSION__ +# workaround per https://github.com/plone/Products.CMFPlone/issues/3848 +[instance-settings] +zope-conf-additional = + + form-memory-limit 20MB + + [versions] # plone products (maybe need to be removed when upgrading plone versions) +plone.recipe.zope2instance = 6.12.2 plone.formwidget.contenttree = 1.2.0 plone.patternslib = 1.3.0 From 03d9c41092bbaac1e1048ceb0faa6044dd0583c2 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Wed, 11 Oct 2023 21:50:59 +0200 Subject: [PATCH 08/21] upgrade collective.sentry --- CHANGELOG.md | 2 ++ versions.cfg | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88b3b65..4dff36a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unreleased - Upgrade Plone 6.0.4 -> 6.0.7 [mamico] +- Upgrade collective.sentry 0.3.0 -> 0.3.1 [mamico] + - Fix SENTRY_MAX_LENGTH default value. [folix-01] ## 20230906-01 diff --git a/versions.cfg b/versions.cfg index 62f8dc7..6b2b190 100644 --- a/versions.cfg +++ b/versions.cfg @@ -27,7 +27,7 @@ collective.feedback = 1.0.0 collective.geolocationbehavior = 1.7.1 collective.honeypot = 2.1 collective.purgebyid = 1.2.0 -collective.sentry = 0.3.0 +collective.sentry = 0.3.1 collective.taxonomy = 3.0.1 collective.tiles.collection = 2.0.0 collective.venue = 4.1 From a0b5e59df1eab3e1064f2593d7d04fba3c0a4665 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 7 Nov 2023 11:23:39 +0100 Subject: [PATCH 09/21] 6.0.8 --- CHANGELOG.md | 4 +--- versions.cfg | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dff36a..241940b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,7 @@ ## Unreleased -- Upgrade Plone 6.0.4 -> 6.0.7 [mamico] -- Upgrade collective.sentry 0.3.0 -> 0.3.1 [mamico] - - Fix SENTRY_MAX_LENGTH default value. [folix-01] +- Upgrade Plone 6.0.4 -> 6.0.8 [mamico] ## 20230906-01 diff --git a/versions.cfg b/versions.cfg index 6b2b190..1465a66 100644 --- a/versions.cfg +++ b/versions.cfg @@ -1,8 +1,8 @@ [buildout] extends = - https://dist.plone.org/release/6.0.7/versions.cfg - https://dist.plone.org/release/6.0.7/versions-ecosystem.cfg - https://dist.plone.org/release/6.0.7/versions-extra.cfg + https://dist.plone.org/release/6.0.8/versions.cfg + https://dist.plone.org/release/6.0.8/versions-ecosystem.cfg + https://dist.plone.org/release/6.0.8/versions-extra.cfg [iocomune] version = __CURRENT_VERSION__ @@ -16,7 +16,6 @@ zope-conf-additional = [versions] # plone products (maybe need to be removed when upgrading plone versions) -plone.recipe.zope2instance = 6.12.2 plone.formwidget.contenttree = 1.2.0 plone.patternslib = 1.3.0 @@ -27,7 +26,8 @@ collective.feedback = 1.0.0 collective.geolocationbehavior = 1.7.1 collective.honeypot = 2.1 collective.purgebyid = 1.2.0 -collective.sentry = 0.3.1 +# XXX: non aggiornare alla 0.3.1, aspettare la 0.3.2 +collective.sentry = 0.3.0 collective.taxonomy = 3.0.1 collective.tiles.collection = 2.0.0 collective.venue = 4.1 From f4b3bc16cdab0c1e6e1f640ea1dd3d01d9b79112 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 7 Nov 2023 12:22:51 +0100 Subject: [PATCH 10/21] update click --- versions.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.cfg b/versions.cfg index 85b32bb..db85be0 100644 --- a/versions.cfg +++ b/versions.cfg @@ -142,7 +142,7 @@ zc.recipe.cmmi = 3.0.0 plone.recipe.varnish = 6.0.11 collective.recipe.template = 2.2 collective.recipe.cmd = 0.11 -click = 8.1.3 +click = 8.1.7 # do not fix these (?) setuptools= From e662f854d2e59dc9159a6fdf237754bc88758755 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 12:12:46 +0100 Subject: [PATCH 11/21] set-output deprecated --- .github/workflows/build.yml | 53 +++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8997d4a..4edf0c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,30 +35,36 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Get the image id - id: get_image_id + # id: get_image_id run: | IMAGE_ID=$(echo ghcr.io/${{ github.repository }} | tr '[A-Z]' '[a-z]') - echo ::set-output name=IMAGE_ID::$IMAGE_ID + echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" + # echo ::set-output name=IMAGE_ID::$IMAGE_ID + + # - name: Extract branch name + # shell: bash + # run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + # id: extract_branch - - name: Extract branch name - shell: bash - run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - id: extract_branch + - name: Get the version PR + run: echo "VERSION={{ $github.base_ref }} >> "$GITHUB_ENV" + if: github.event_name == 'pull_request' - name: Get the version - id: get_version - run: | - VERSION="${{ steps.extract_branch.outputs.branch }}" - [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') - [ "$VERSION" == "main" ] && VERSION=latest - echo ::set-output name=VERSION::$VERSION + run: echo "VERSION={{ $github.ref_name }} >> "$GITHUB_ENV" + if: github.event_name != 'pull_request' + + # VERSION="${{ steps.extract_branch.outputs.branch }}" + # [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') + # [ "$VERSION" == "main" ] && VERSION=latest + # echo ::set-output name=VERSION::$VERSION - name: Build and push container image uses: docker/build-push-action@v3 with: context: . push: true - tags: ${{ steps.get_image_id.outputs.IMAGE_ID }}:${{ steps.get_version.outputs.VERSION }} + tags: $IMAGE_ID:$VERSION platforms: linux/amd64,linux/arm64 - name: Deploy to rancher # io-comune-test @@ -72,7 +78,7 @@ jobs: project-id: ${{ secrets.RANCHER_PROJECT_ID }} # organization namespace: ${{ secrets.RANCHER_NAMESPACE }} workload: ${{ secrets.RANCHER_WORKLOAD }} - image: ${{ steps.get_image_id.outputs.IMAGE_ID }}:${{ steps.get_version.outputs.VERSION }} + image: $IMAGE_ID:$VERSION slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }} - name: Trigger job @@ -81,7 +87,7 @@ jobs: curl --fail --request POST \ --form token=${{ secrets.TOKEN }} \ --form ref=main \ - --form "variables[GITHUB_TAG]=${{ steps.get_version.outputs.VERSION }}" \ + --form "variables[GITHUB_TAG]=$VERSION" \ "https://gitlab.com/api/v4/projects/${{ secrets.PROJECT_ID }}/trigger/pipeline" build-acceptance-image: @@ -110,15 +116,16 @@ jobs: id: get_image_id run: | IMAGE_ID=$(echo ghcr.io/${{ github.repository }}-acceptance | tr '[A-Z]' '[a-z]') - echo ::set-output name=IMAGE_ID::$IMAGE_ID + echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" + # echo ::set-output name=IMAGE_ID::$IMAGE_ID + + - name: Get the version PR + run: echo "VERSION={{ $github.base_ref }} >> "$GITHUB_ENV" + if: github.event_name == 'pull_request' - name: Get the version - id: get_version - run: | - VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') - [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') - [ "$VERSION" == "main" ] && VERSION=latest - echo ::set-output name=VERSION::$VERSION + run: echo "VERSION={{ $github.ref_name }} >> "$GITHUB_ENV" + if: github.event_name != 'pull_request' - name: Build and push container image uses: docker/build-push-action@v3 @@ -126,5 +133,5 @@ jobs: context: . file: ./Dockerfile.acceptance push: true - tags: ${{ steps.get_image_id.outputs.IMAGE_ID }}:${{ steps.get_version.outputs.VERSION }} + tags: $IMAGE_ID:$VERSION platforms: linux/amd64,linux/arm64 From 6e62f460afc977e8e81ae2f39961c61afa0b7580 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 12:14:06 +0100 Subject: [PATCH 12/21] typo --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4edf0c7..864a094 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,11 +47,11 @@ jobs: # id: extract_branch - name: Get the version PR - run: echo "VERSION={{ $github.base_ref }} >> "$GITHUB_ENV" + run: echo "VERSION={{ $github.base_ref }}" >> "$GITHUB_ENV" if: github.event_name == 'pull_request' - name: Get the version - run: echo "VERSION={{ $github.ref_name }} >> "$GITHUB_ENV" + run: echo "VERSION={{ $github.ref_name }}" >> "$GITHUB_ENV" if: github.event_name != 'pull_request' # VERSION="${{ steps.extract_branch.outputs.branch }}" @@ -120,11 +120,11 @@ jobs: # echo ::set-output name=IMAGE_ID::$IMAGE_ID - name: Get the version PR - run: echo "VERSION={{ $github.base_ref }} >> "$GITHUB_ENV" + run: echo "VERSION={{ $github.base_ref }}" >> "$GITHUB_ENV" if: github.event_name == 'pull_request' - name: Get the version - run: echo "VERSION={{ $github.ref_name }} >> "$GITHUB_ENV" + run: echo "VERSION={{ $github.ref_name }}" >> "$GITHUB_ENV" if: github.event_name != 'pull_request' - name: Build and push container image From 5fca2cae6b7161c0e45cc501109bc58c24e64115 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 12:22:18 +0100 Subject: [PATCH 13/21] env --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 864a094..bf8daad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: with: context: . push: true - tags: $IMAGE_ID:$VERSION + tags: ${{ env.IMAGE_ID }}:${{ env.VERSION }} platforms: linux/amd64,linux/arm64 - name: Deploy to rancher # io-comune-test @@ -78,7 +78,7 @@ jobs: project-id: ${{ secrets.RANCHER_PROJECT_ID }} # organization namespace: ${{ secrets.RANCHER_NAMESPACE }} workload: ${{ secrets.RANCHER_WORKLOAD }} - image: $IMAGE_ID:$VERSION + image: ${{ env.IMAGE_ID }}:${{ env.VERSION }} slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }} - name: Trigger job @@ -133,5 +133,5 @@ jobs: context: . file: ./Dockerfile.acceptance push: true - tags: $IMAGE_ID:$VERSION + tags: ${{ env.IMAGE_ID }}:${{ env.VERSION }} platforms: linux/amd64,linux/arm64 From a07fa41ac2e82ccc69a0f1afccb6d89385d9a604 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 12:23:10 +0100 Subject: [PATCH 14/21] Update mx.ini --- mx.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mx.ini b/mx.ini index 311d1ec..d779475 100644 --- a/mx.ini +++ b/mx.ini @@ -6,6 +6,6 @@ contraints-out = constraints-mxdev.txt # custom variables github = https://github.com -[design.plone.contenttypes] -url = ${settings:github}/RedTurtle/design.plone.contenttypes.git -branch = cekk_check_views +# [design.plone.contenttypes] +# url = ${settings:github}/RedTurtle/design.plone.contenttypes.git +# branch = cekk_check_views From 39a8bf2118bb3b06d3402e1ac238b109beb597e6 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 12:25:37 +0100 Subject: [PATCH 15/21] typo --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf8daad..8a17598 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,11 +47,11 @@ jobs: # id: extract_branch - name: Get the version PR - run: echo "VERSION={{ $github.base_ref }}" >> "$GITHUB_ENV" + run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" if: github.event_name == 'pull_request' - name: Get the version - run: echo "VERSION={{ $github.ref_name }}" >> "$GITHUB_ENV" + run: echo "VERSION=${{ github.ref_name }}" >> "$GITHUB_ENV" if: github.event_name != 'pull_request' # VERSION="${{ steps.extract_branch.outputs.branch }}" @@ -120,11 +120,11 @@ jobs: # echo ::set-output name=IMAGE_ID::$IMAGE_ID - name: Get the version PR - run: echo "VERSION={{ $github.base_ref }}" >> "$GITHUB_ENV" + run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" if: github.event_name == 'pull_request' - name: Get the version - run: echo "VERSION={{ $github.ref_name }}" >> "$GITHUB_ENV" + run: echo "VERSION=${{ github.ref_name }}" >> "$GITHUB_ENV" if: github.event_name != 'pull_request' - name: Build and push container image From 11a88633f5a663499436ba3ef1e0d17137ebbb1d Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 12:59:06 +0100 Subject: [PATCH 16/21] Update build_development.yml --- .github/workflows/build_development.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_development.yml b/.github/workflows/build_development.yml index 25ce314..2ef1354 100644 --- a/.github/workflows/build_development.yml +++ b/.github/workflows/build_development.yml @@ -29,15 +29,13 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Get the image id - id: get_image_id run: | IMAGE_ID=$(echo ghcr.io/${{ github.repository }} | tr '[A-Z]' '[a-z]') - echo ::set-output name=IMAGE_ID::$IMAGE_ID + echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" - name: Extract branch name shell: bash - run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - id: extract_branch + run: echo "IMAGE_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> "$GITHUB_ENV" - name: Build and push container image uses: docker/build-push-action@v3 @@ -45,5 +43,5 @@ jobs: context: . file: ./Dockerfile.development push: true - tags: ${{ steps.get_image_id.outputs.IMAGE_ID }}:${{ steps.extract_branch.outputs.branch }}_development + tags: ${{ env.IMAGE_ID}}:${{ env.IMAGE_BRANCH }}_development platforms: linux/amd64,linux/arm64 From 5d7f22864191446df9b6486374900a15827fd520 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 13:00:33 +0100 Subject: [PATCH 17/21] cleanup --- .github/workflows/build.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a17598..b968696 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Login to Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -39,12 +39,6 @@ jobs: run: | IMAGE_ID=$(echo ghcr.io/${{ github.repository }} | tr '[A-Z]' '[a-z]') echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" - # echo ::set-output name=IMAGE_ID::$IMAGE_ID - - # - name: Extract branch name - # shell: bash - # run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - # id: extract_branch - name: Get the version PR run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" @@ -53,11 +47,6 @@ jobs: - name: Get the version run: echo "VERSION=${{ github.ref_name }}" >> "$GITHUB_ENV" if: github.event_name != 'pull_request' - - # VERSION="${{ steps.extract_branch.outputs.branch }}" - # [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') - # [ "$VERSION" == "main" ] && VERSION=latest - # echo ::set-output name=VERSION::$VERSION - name: Build and push container image uses: docker/build-push-action@v3 @@ -106,7 +95,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Login to Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -117,7 +106,6 @@ jobs: run: | IMAGE_ID=$(echo ghcr.io/${{ github.repository }}-acceptance | tr '[A-Z]' '[a-z]') echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" - # echo ::set-output name=IMAGE_ID::$IMAGE_ID - name: Get the version PR run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" From b3c0b3f0114fc596f8148e612f262a1e9ab41b07 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 13:03:10 +0100 Subject: [PATCH 18/21] Update build.yml --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b968696..8142b44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,13 +40,13 @@ jobs: IMAGE_ID=$(echo ghcr.io/${{ github.repository }} | tr '[A-Z]' '[a-z]') echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" - - name: Get the version PR - run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' + # - name: Get the version PR + # run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" + # if: github.event_name == 'pull_request' - name: Get the version run: echo "VERSION=${{ github.ref_name }}" >> "$GITHUB_ENV" - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' - name: Build and push container image uses: docker/build-push-action@v3 @@ -107,13 +107,13 @@ jobs: IMAGE_ID=$(echo ghcr.io/${{ github.repository }}-acceptance | tr '[A-Z]' '[a-z]') echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" - - name: Get the version PR - run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' + # - name: Get the version PR + # run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" + # if: github.event_name == 'pull_request' - name: Get the version run: echo "VERSION=${{ github.ref_name }}" >> "$GITHUB_ENV" - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' - name: Build and push container image uses: docker/build-push-action@v3 From 82e156efb73ba0aef67e52c85cce927c75301fa9 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 13:06:55 +0100 Subject: [PATCH 19/21] Update build.yml --- .github/workflows/build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8142b44..e33a313 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,18 +35,17 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Get the image id - # id: get_image_id run: | IMAGE_ID=$(echo ghcr.io/${{ github.repository }} | tr '[A-Z]' '[a-z]') echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" - # - name: Get the version PR - # run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" - # if: github.event_name == 'pull_request' + - name: Get the version PR + run: echo "VERSION=${{ github.head_ref }}" >> "$GITHUB_ENV" + if: github.event_name == 'pull_request' - name: Get the version run: echo "VERSION=${{ github.ref_name }}" >> "$GITHUB_ENV" - # if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' - name: Build and push container image uses: docker/build-push-action@v3 @@ -107,13 +106,13 @@ jobs: IMAGE_ID=$(echo ghcr.io/${{ github.repository }}-acceptance | tr '[A-Z]' '[a-z]') echo "IMAGE_ID=$IMAGE_ID" >> "$GITHUB_ENV" - # - name: Get the version PR - # run: echo "VERSION=${{ github.base_ref }}" >> "$GITHUB_ENV" - # if: github.event_name == 'pull_request' + - name: Get the version PR + run: echo "VERSION=${{ github.head_ref }}" >> "$GITHUB_ENV" + if: github.event_name == 'pull_request' - name: Get the version run: echo "VERSION=${{ github.ref_name }}" >> "$GITHUB_ENV" - # if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' - name: Build and push container image uses: docker/build-push-action@v3 From a06f0d80a27e0563fb08b84ef7f3a3e007bf09e0 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 28 Nov 2023 18:47:46 +0100 Subject: [PATCH 20/21] maxupload default a 120MB, patternslib --- versions.cfg | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/versions.cfg b/versions.cfg index a729cad..8439db0 100644 --- a/versions.cfg +++ b/versions.cfg @@ -7,14 +7,20 @@ extends = [iocomune] version = __CURRENT_VERSION__ +[config] +maxupload = 120MB + # workaround per https://github.com/plone/Products.CMFPlone/issues/3848 [instance-settings] zope-conf-additional = - form-memory-limit 20MB + form-memory-limit ${config:maxupload} [versions] +# plone missing +plone.patternslib = 1.3.0 + # agid-related products collective.address = 1.6 collective.exportimport = 1.7 From 97cd46e4c84b7504b54f732ec1ee4a51b1c10099 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Wed, 29 Nov 2023 01:01:56 +0100 Subject: [PATCH 21/21] plone.formwidget.contenttree = 1.2.0 --- versions.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.cfg b/versions.cfg index 8439db0..85b84c0 100644 --- a/versions.cfg +++ b/versions.cfg @@ -20,6 +20,7 @@ zope-conf-additional = [versions] # plone missing plone.patternslib = 1.3.0 +plone.formwidget.contenttree = 1.2.0 # agid-related products collective.address = 1.6