Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Release/3.11.x #7457

Closed
wants to merge 137 commits into from
Closed

ci: Release/3.11.x #7457

wants to merge 137 commits into from

Conversation

fsbraun
Copy link
Sponsor Member

@fsbraun fsbraun commented Dec 14, 2022

Description

Merge release 3.11.1 back into develop.

Related resources

  • #...
  • #...

Checklist

  • I have opened this pull request against develop
  • I have added or modified the tests when changing logic
  • I have followed the conventional commits guidelines to add meaningful information into the changelog
  • I have read the contribution guidelines and I have joined #workgroup-pr-review on Slack to find a “pr review buddy” who is going to review my pull request.

Florian Delizy and others added 30 commits February 2, 2022 00:10
* [3.10.0rc1 release process] Bumped version to 3.10.0rc1
* [3.10.0rc1 release process] compilemessages
* [3.10.0rc1 release process] compiling new static files
* [3.10.0rc1 release process] updating latest docs
* Fix script typos (django-cms#7201)
* [refactor] Typos in release scripts
* This was correct.

Co-authored-by: Simon Krull <simondotunix@gmail.com>

* feat: Added concurrency option to github workflows (django-cms#7205)
* fix: Disable workflow concurrency to bring stability back to the CI (django-cms#7209)
* Upgrade Gulp and Nodejs (django-cms#7208)
* feat: upgrade sass and gulp sass so that it installs on a modern node.js
* fix: upgrade some packages and gulp config to 4.x series
* fix: add support for icons working as well
* Feat: get some tasks to work
* fix: port one more tasks even if it is still erroring
* wip: still broken config for webpack bundle
* fix: let the new tests run
* fix: issue with lint task
* fix: some more issues with loaders
* feat: get some tests passing atleast
* fix: the frontend tests pass now
* feat: generate new lock file
* feat: use gulp 4.x
* feat: make build use node16 as well
* feat: add .nvmrc for a consistent experience
* feat: Run workflows in concurrency groups (django-cms#7211)
* feat: Added concurrency config using unique workflow groups
* Remove whitespace to test cancellation
* Remove whitespace to test cancellation 2

Co-authored-by: Vinit Kumar <mail@vinitkumar.me>
Co-authored-by: Simon Krull <simondotunix@gmail.com>
* Fix script typos (django-cms#7201)

* [refactor] Typos in release scripts

* This was correct.

Co-authored-by: Simon Krull <simondotunix@gmail.com>

* feat: Added concurrency option to github workflows (django-cms#7205)

* fix: Disable workflow concurrency to bring stability back to the CI (django-cms#7209)

* Upgrade Gulp and Nodejs (django-cms#7208)

* feat: upgrade sass and gulp sass so that it installs on a modern node.js

* fix: upgrade some packages and gulp config to 4.x series

* fix: add support for icons working as well

* Feat: get some tasks to work

* fix: port one more tasks even if it is still erroring

* wip: still broken config for webpack bundle

* fix: let the new tests run

* fix: issue with lint task

* fix: some more issues with loaders

* feat: get some tests passing atleast

* fix: the frontend tests pass now

* feat: generate new lock file

* feat: use gulp 4.x

* feat: make build use node16 as well

* feat: add .nvmrc for a consistent experience

* feat: Run workflows in concurrency groups (django-cms#7211)

* feat: Added concurrency config using unique workflow groups

* Remove whitespace to test cancellation

* Remove whitespace to test cancellation 2

Co-authored-by: Vinit Kumar <mail@vinitkumar.me>

* fix: Toolbar bug in 3.10 (django-cms#7232)

Co-authored-by: fsbraun <fsbraun@gmx.de>

Co-authored-by: Mark Walker <theshow@gmail.com>
Co-authored-by: Simon Krull <simondotunix@gmail.com>
Co-authored-by: fsbraun <fsbraun@gmx.de>
* [3.10.0rc2 release process] Bumped version to 3.10.0rc2
* [3.10.0rc2 release process] compilemessages
* [3.10.0rc2 release process] compiling new static files
* [3.10.0rc2 release process] updating latest docs
…nt toolbar… (django-cms#7289)

* Fixes django-cms#7288 by also catching AttributeError, when the current toolbar object doesn't define get_draft_url()

* django-cms#7288: also catch AttributeError when `get_absolute_url()` isn't defined.
* Fix for django 2.2 in middleware [django-cms#7290]

* Address isort concern
* Update release script to make it compatible with BSD (macos) compatible

* Fix version number in bump commit
* [3.11.0 release process] Bumped version to 3.11.0

* [3.11.0 release process] compilemessages

* [3.11.0 release process] compiling new static files

* [3.11.0 release process] updating latest docs

* [3.11.0rc1 release process] Bumped version to 3.11.0rc1

* Added static files

* Removed static files of 0.3.11 release

* Manually added changes to the upgrade docs

* Adjusted upgrade note header
# Conflicts:
#	.github/workflows/frontend.yml
#	CHANGELOG.rst
#	docs/upgrade/3.10.0.rst
#	package-lock.json
#	package.json
# Conflicts:
#	cms/__init__.py
#	cms/locale/en/LC_MESSAGES/django.po
#	cms/locale/en/LC_MESSAGES/djangojs.po
#	cms/locale/hr/LC_MESSAGES/django.po
#	cms/locale/pl/LC_MESSAGES/django.po
#	cms/locale/pl/LC_MESSAGES/djangojs.po
#	cms/static/cms/fonts/3.10.1/django-cms-iconfont.eot
#	cms/static/cms/fonts/3.10.1/django-cms-iconfont.svg
#	cms/static/cms/fonts/3.10.1/django-cms-iconfont.ttf
#	cms/static/cms/fonts/3.11.0/django-cms-iconfont.eot
#	cms/static/cms/fonts/3.11.0/django-cms-iconfont.svg
#	cms/static/cms/fonts/3.11.0/django-cms-iconfont.ttf
#	cms/static/cms/fonts/3.11.1/django-cms-iconfont.eot
#	cms/static/cms/fonts/3.11.1/django-cms-iconfont.svg
#	cms/static/cms/fonts/3.11.1/django-cms-iconfont.ttf
#	cms/static/cms/js/dist/3.10.1/bundle.admin.base.min.js
#	cms/static/cms/js/dist/3.10.1/bundle.admin.changeform.min.js
#	cms/static/cms/js/dist/3.10.1/bundle.admin.pagetree.min.js
#	cms/static/cms/js/dist/3.10.1/bundle.admin.widget.min.js
#	cms/static/cms/js/dist/3.10.1/bundle.forms.apphookselect.min.js
#	cms/static/cms/js/dist/3.10.1/bundle.forms.pageselectwidget.min.js
#	cms/static/cms/js/dist/3.10.1/bundle.forms.pagesmartlinkwidget.min.js
#	cms/static/cms/js/dist/3.10.1/bundle.forms.slugwidget.min.js
#	cms/static/cms/js/dist/3.11.0/bundle.admin.base.min.js
#	cms/static/cms/js/dist/3.11.0/bundle.admin.changeform.min.js
#	cms/static/cms/js/dist/3.11.0/bundle.admin.pagetree.min.js
#	cms/static/cms/js/dist/3.11.0/bundle.admin.widget.min.js
#	cms/static/cms/js/dist/3.11.0/bundle.forms.apphookselect.min.js
#	cms/static/cms/js/dist/3.11.0/bundle.forms.pageselectwidget.min.js
#	cms/static/cms/js/dist/3.11.0/bundle.forms.pagesmartlinkwidget.min.js
#	cms/static/cms/js/dist/3.11.0/bundle.forms.slugwidget.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.admin.base.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.admin.changeform.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.admin.pagetree.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.admin.widget.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.forms.apphookselect.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.forms.pageselectwidget.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.forms.pagesmartlinkwidget.min.js
#	cms/static/cms/js/dist/3.11.1/bundle.forms.slugwidget.min.js
#	cms/static/cms/sass/components/_iconography.scss
#	docs/requirements.txt
#	docs/upgrade/index.rst
#	package-lock.json
@fsbraun fsbraun changed the title Release/3.11.x ci: Release/3.11.x Dec 14, 2022
@fsbraun fsbraun closed this Jan 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants