Skip to content

Commit

Permalink
[github] use main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanBldy committed Jan 10, 2025
1 parent 78d827b commit 26526b4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ If you want to contribute some code:
1. fork the `official Flask-FS repository`_
2. create a branch with an explicit name (like ``my-new-feature`` or ``issue-XX``)
3. do your work in it
4. rebase it on the master branch from the official repository (cleanup your history by performing an interactive rebase)
4. rebase it on the main branch from the official repository (cleanup your history by performing an interactive rebase)
5. submit your pull-request

There are some rules to follow:
Expand Down
6 changes: 3 additions & 3 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
We release Flask-FS2 versions through Github Actions on Pypi. Every time a new version is ready, we
follow this process:

1. Rebase on the master branch.
1. Rebase on the main branch.
2. Up the version number located the `flask_fs/__version__` file.
3. Push changes to `master` branch.
3. Push changes to `main` branch.
4. Tag the commit and push the changes to Github.
5. Github Actions will build the package from the sources and publish the package on Pypi

You can run a script to perform these commands at once, he is located in scripts/release.sh.

# Deployment

Please see the Zou documentation for the update instructions.
Please see the Zou documentation for the update instructions.
4 changes: 2 additions & 2 deletions scripts/release.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
set -e
git pull --rebase origin master
git pull --rebase origin main
last_release_number=$(python -c "from flask_fs import __version__; print(__version__)")
release_number=$(echo ${last_release_number} | awk -F. -v OFS=. '{$NF += 1 ; print}')
echo "__version__ = \"$release_number\"" > flask_fs/__version__.py
git commit flask_fs/__version__.py -m $release_number
git tag v$release_number
git push origin master --tag
git push origin main --tag

0 comments on commit 26526b4

Please sign in to comment.