From 75e64f506597158fcd850ce76c5715acf7b0a163 Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali Date: Tue, 19 Nov 2024 16:47:14 +0500 Subject: [PATCH] feat!: Rename branches master->release, nightly->main --- .github/workflows/sync.yml | 2 +- .github/workflows/test.yml | 4 +++- README.rst | 2 +- changelog.d/20241119_164506_dawoud.sheraz_branch_rename.md | 3 +++ tutornotes/plugin.py | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 changelog.d/20241119_164506_dawoud.sheraz_branch_rename.md diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 69ba03a..07f7ff4 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 23a429f..398a0ba 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 88efce5..43fece8 100644 --- a/README.rst +++ b/README.rst @@ -59,4 +59,4 @@ This Tutor plugin is maintained by Jhony Avella from `eduNEXT `_. +This software is licensed under the terms of the `GNU Affero General Public License (AGPL) `_. diff --git a/changelog.d/20241119_164506_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_164506_dawoud.sheraz_branch_rename.md new file mode 100644 index 0000000..fb6e264 --- /dev/null +++ b/changelog.d/20241119_164506_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/tutornotes/plugin.py b/tutornotes/plugin.py index fe2e5a3..b98f46b 100644 --- a/tutornotes/plugin.py +++ b/tutornotes/plugin.py @@ -10,7 +10,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__