diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 6791bfac..8cef67cf 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -2,7 +2,7 @@ name: Sync with private repo on: push: - branches: [ master, main, nightly ] + branches: [ release, main ] jobs: sync: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f58372e6..5c50b595 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,9 @@ name: Run tests on: pull_request: - branches: [master] + branches: [ release, main ] + push: + branches: [ release, main ] jobs: tests: diff --git a/README.rst b/README.rst index cb67b62e..7183ce17 100644 --- a/README.rst +++ b/README.rst @@ -161,4 +161,4 @@ Pull requests are welcome! Please read the `"contributing" section from the Tuto 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) `_. diff --git a/changelog.d/20241119_123631_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_123631_dawoud.sheraz_branch_rename.md new file mode 100644 index 00000000..fb6e264c --- /dev/null +++ b/changelog.d/20241119_123631_dawoud.sheraz_branch_rename.md @@ -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. \ No newline at end of file diff --git a/tutorecommerce/plugin.py b/tutorecommerce/plugin.py index fef5e2aa..6edc023c 100644 --- a/tutorecommerce/plugin.py +++ b/tutorecommerce/plugin.py @@ -11,7 +11,7 @@ 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__: __version__ += "-" + __version_suffix__