Remove references to master
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
parent
b27c01bc9b
commit
5ff321c229
3 changed files with 1 additions and 23 deletions
|
@ -6,7 +6,6 @@ stages:
|
||||||
build-doc:
|
build-doc:
|
||||||
stage: build
|
stage: build
|
||||||
only:
|
only:
|
||||||
- master@poezio/poezio
|
|
||||||
- main@poezio/poezio
|
- main@poezio/poezio
|
||||||
tags:
|
tags:
|
||||||
- www
|
- www
|
||||||
|
@ -30,7 +29,6 @@ build-ubuntu:
|
||||||
paths:
|
paths:
|
||||||
- dist/
|
- dist/
|
||||||
only:
|
only:
|
||||||
- master
|
|
||||||
- main
|
- main
|
||||||
|
|
||||||
security-check:
|
security-check:
|
||||||
|
|
|
@ -76,7 +76,7 @@ Options
|
||||||
Set the default browser started by the plugin
|
Set the default browser started by the plugin
|
||||||
|
|
||||||
.. _Unix FIFO: https://en.wikipedia.org/wiki/Named_pipe
|
.. _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
|
import platform
|
||||||
|
|
20
update.sh
20
update.sh
|
@ -27,26 +27,6 @@ $POEZIO_PYTHON -c 'import venv' &> /dev/null || {
|
||||||
exit 1
|
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'
|
echo 'Updating poezio'
|
||||||
git pull --ff-only origin main || {
|
git pull --ff-only origin main || {
|
||||||
echo "The script failed to update poezio."
|
echo "The script failed to update poezio."
|
||||||
|
|
Loading…
Reference in a new issue