Merge branch 'release'

This commit is contained in:
Régis Behmo 2024-11-27 18:35:01 +01:00
commit 468662c75c
5 changed files with 9 additions and 4 deletions

View File

@ -2,7 +2,7 @@ name: Sync with private repo
on: on:
push: push:
branches: [ master, main, nightly ] branches: [ release, main ]
jobs: jobs:
sync: sync:

View File

@ -2,7 +2,9 @@ name: Run tests
on: on:
pull_request: pull_request:
branches: [master] branches: [release, main]
push:
branches: [release, main]
jobs: jobs:
tests: tests:

View File

@ -218,4 +218,4 @@ License
This work is licensed under the terms of the `GNU Affero General Public License (AGPL)`_. This work is licensed under the terms of the `GNU Affero General Public License (AGPL)`_.
.. _GNU Affero General Public License (AGPL): https://github.com/overhangio/tutor/blob/master/LICENSE.txt .. _GNU Affero General Public License (AGPL): https://github.com/overhangio/tutor/blob/release/LICENSE.txt

View File

@ -0,0 +1,3 @@
- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz):
* Rename **master** to **release**, as this branch runs the latest official Open edX release tag.
* Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release.

View File

@ -10,7 +10,7 @@ from tutor.__about__ import __version_suffix__
from .__about__ import __version__ from .__about__ import __version__
# Handle version suffix in nightly mode, just like tutor core # Handle version suffix in main mode, just like tutor core
if __version_suffix__: if __version_suffix__:
__version__ += "-" + __version_suffix__ __version__ += "-" + __version_suffix__