Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
regisb committed Nov 27, 2024
2 parents 7d16414 + 75e64f5 commit e52064f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Sync with private repo

on:
push:
branches: [ master, main, nightly ]
branches: [ release, main ]

jobs:
sync:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Run tests

on:
pull_request:
branches: [master]
branches: [ release, main ]
push:
branches: [ release, main ]

jobs:
tests:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ This Tutor plugin is maintained by Jhony Avella from `eduNEXT <https://www.edune
License
-------

This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-notes/blob/master/LICENSE.txt>`_.
This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-notes/blob/release/LICENSE.txt>`_.
3 changes: 3 additions & 0 deletions changelog.d/20241119_164506_dawoud.sheraz_branch_rename.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion tutornotes/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__

Expand Down

0 comments on commit e52064f

Please sign in to comment.