Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
Fix #438
  • Loading branch information
FrostyX committed Apr 22, 2024
1 parent fb1e00e commit 481394e
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/fedora-tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

name: Run Tox tests
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-diff-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Lint Python issues

on:
pull_request:
branches: [master]
branches: [main]

jobs:
python-lint-job:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shell-diff-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Lint Shell issues

on:
pull_request:
branches: [master]
branches: [main]

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .packit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
metadata:
owner: "@rpm-software-management"
project: "tito"
branch: master
branch: main
2 changes: 1 addition & 1 deletion HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ When developing code for tito there are a couple ways you can test:

First install Tito's dependencies for your architecture, i.e. `x86_64`, like
described in [README's INSTALL section](README.md#INSTALL), under installation
from git's `master` branch.
from git's `main` branch.

Then create a virtual environment and install tito in editable mode:

Expand Down
8 changes: 4 additions & 4 deletions doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,27 @@ From [PyPI](https://pypi.org/project/tito/):

pip install tito

[Pre-release versions for Fedora](https://copr.fedorainfracloud.org/coprs/g/rpm-software-management/tito/) (built from git `master` branch):
[Pre-release versions for Fedora](https://copr.fedorainfracloud.org/coprs/g/rpm-software-management/tito/) (built from git `main` branch):

dnf copr enable @rpm-software-management/tito
dnf install tito

From git's `master` branch:
From git's `main` branch:

- First install Tito's dependencies for your architecture, i.e. `x86_64`:

sudo dnf install --setopt=install_weak_deps=False \
$(dnf repoquery --arch x86_64,noarch --requires tito --resolve -q)

_NOTE: This will install Tito's dependencies from Tito's latest release for
your system. If the `master` branch requires a new dependency, it will need to
your system. If the `main` branch requires a new dependency, it will need to
be installed manually._

- Then install Tito via so-called [User install](
https://pip.pypa.io/en/stable/user_guide/#user-installs) (i.e. isolated to the
current user):

pip install --user https://github.com/rpm-software-management/tito/archive/master.tar.gz
pip install --user https://github.com/rpm-software-management/tito/archive/main.tar.gz

To make an rpm of tito to install elsewhere

Expand Down
2 changes: 1 addition & 1 deletion doc/maintenance.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
If you are releasing a new version of Tito, please follow these steps:

1. Make sure Travis tests are passing
2. Make sure it is possible to build tito package from `master` branch for all
2. Make sure it is possible to build tito package from `main` branch for all
currently supported Fedora versions. Either by using [mock][mock], or using
Copr `tito release copr --test`
3. Make sure that `[fedora]` releaser in `.tito/releasers.conf` contains all
Expand Down
2 changes: 1 addition & 1 deletion tito
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ run_python=${PYTHON-python3}
echo >&2 "\
Warning: Running Tito from a git repository is not supported.
If you are not a developer working on Tito code, please install it properly
https://github.com/rpm-software-management/tito/blob/master/doc/index.md#install
https://github.com/rpm-software-management/tito/blob/main/doc/index.md#install
"

export PYTHONPATH
Expand Down

0 comments on commit 481394e

Please sign in to comment.