diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml index beb4a002..d387bc10 100644 --- a/.github/workflows/multiarch.yml +++ b/.github/workflows/multiarch.yml @@ -4,7 +4,7 @@ on: branches: - testing - staging - - '2024.03' + - '2024.06' - master - test-* diff --git a/.mergify.yml b/.mergify.yml index 5f325cd5..6b5f0d1e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -35,18 +35,18 @@ pull_request_rules: comment: message: bors r+ - - name: Backport to 2024.03 branch + - name: Backport to 2024.06 branch conditions: - base=master - label=type/backport actions: backport: branches: - - '2024.03' + - '2024.06' - name: remove outdated reviews conditions: - - base~=^(master|2024.03)$ + - base~=^(master|2024.06)$ actions: dismiss_reviews: approved: True diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py index 2c8affd6..167d4577 100644 --- a/core/admin/mailu/configuration.py +++ b/core/admin/mailu/configuration.py @@ -31,7 +31,7 @@ DEFAULT_CONFIG = { 'SQLALCHEMY_TRACK_MODIFICATIONS': False, # Statistics management 'INSTANCE_ID_PATH': '/data/instance', - 'STATS_ENDPOINT': '202403.{}.stats.mailu.io', + 'STATS_ENDPOINT': '202406.{}.stats.mailu.io', # Common configuration variables 'SECRET_KEY': 'changeMe', 'DOMAIN': 'mailu.io', diff --git a/docs/conf.py b/docs/conf.py index 8859061b..eb3288fd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -36,10 +36,10 @@ html_context = { 'github_user': 'mailu', 'github_repo': 'mailu', 'github_version': version, - 'stable_version': '2024.03', + 'stable_version': '2024.06', 'versions': [ ('2.0', '/2.0/'), - ('2024.03', '/2024.03/'), + ('2024.06', '/2024.06/'), ('master', '/master/') ], 'conf_py_path': '/docs/' diff --git a/docs/setup.rst b/docs/setup.rst index 7b0e8b97..d8df0baa 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -32,7 +32,7 @@ Pick a Mailu version Mailu is shipped in multiple versions. -- ``2024.03`` features the most recent stable version for Mailu. This is the +- ``2024.06`` features the most recent stable version for Mailu. This is the recommended build for new setups, old setups should migrate when possible. - ``1.0``, ``1.1``, and other version branches feature old versions of Mailu