Remove references to master

Signed-off-by: Maxime Buquet's avatarMaxime “pep” Buquet <pep@bouah.net>
parent b27c01bc
Pipeline #3359 passed with stages
in 6 minutes and 19 seconds
......@@ -6,7 +6,6 @@ stages:
build-doc:
stage: build
only:
- master@poezio/poezio
- main@poezio/poezio
tags:
- www
......@@ -30,7 +29,6 @@ build-ubuntu:
paths:
- dist/
only:
- master
- main
security-check:
......
......@@ -76,7 +76,7 @@ Options
Set the default browser started by the plugin
.. _Unix FIFO: https://en.wikipedia.org/wiki/Named_pipe
.. _daemon.py: https://lab.louiz.org/poezio/poezio/raw/master/poezio/daemon.py
.. _daemon.py: https://lab.louiz.org/poezio/poezio/raw/main/poezio/daemon.py
"""
import platform
......
......@@ -27,26 +27,6 @@ $POEZIO_PYTHON -c 'import venv' &> /dev/null || {
exit 1
}
# XXX: Migration from master branch to main
branch=$(git rev-parse --abbrev-ref HEAD)
changes=$(git status --porcelain | grep -v "^??")
if [ "$branch" == "master" ]; then
echo "! WARNING !"
echo "We are changing our default branch to 'main' and we have detected"
echo "you are still using 'master'."
echo
if [ -n "$changes" ]; then
echo "! Manual action required !"
echo "There are uncommited changes in your staging area. Please sort this"
echo "out and then manually checkout the 'main' branch using 'git checkout main'."
exit 1
fi
git checkout main
echo "Automatically switched to 'main' branch."
fi
echo 'Updating poezio'
git pull --ff-only origin main || {
echo "The script failed to update poezio."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment