From 26526b4ec6d54fed77ccc4880d4ea62f2e3d0c50 Mon Sep 17 00:00:00 2001 From: Evan Blaudy Date: Fri, 10 Jan 2025 02:31:43 +0100 Subject: [PATCH] [github] use main branch --- CONTRIBUTING.rst | 2 +- RELEASE.md | 6 +++--- scripts/release.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index fee294d..69061fb 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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: diff --git a/RELEASE.md b/RELEASE.md index 0451385..0b5d44f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -3,9 +3,9 @@ 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 @@ -13,4 +13,4 @@ You can run a script to perform these commands at once, he is located in scripts # Deployment -Please see the Zou documentation for the update instructions. \ No newline at end of file +Please see the Zou documentation for the update instructions. diff --git a/scripts/release.sh b/scripts/release.sh index daf2c3f..309a698 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -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