Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
poezio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
205
Issues
205
List
Boards
Labels
Service Desk
Milestones
Merge Requests
11
Merge Requests
11
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
poezio
poezio
Commits
5ff321c2
Verified
Commit
5ff321c2
authored
Sep 10, 2020
by
Maxime Buquet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove references to master
Signed-off-by:
Maxime “pep” Buquet
<
pep@bouah.net
>
parent
b27c01bc
Pipeline
#3359
passed with stages
in 6 minutes and 19 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
23 deletions
+1
-23
.gitlab-ci.yml
.gitlab-ci.yml
+0
-2
plugins/link.py
plugins/link.py
+1
-1
update.sh
update.sh
+0
-20
No files found.
.gitlab-ci.yml
View file @
5ff321c2
...
...
@@ -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
:
...
...
plugins/link.py
View file @
5ff321c2
...
...
@@ -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/ma
ster
/poezio/daemon.py
.. _daemon.py: https://lab.louiz.org/poezio/poezio/raw/ma
in
/poezio/daemon.py
"""
import
platform
...
...
update.sh
View file @
5ff321c2
...
...
@@ -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."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment