Rename master branch to main

Fix #438
This commit is contained in:
Jakub Kadlcik 2024-04-22 18:24:42 +02:00 committed by Jakub Kadlčík
parent fb1e00e074
commit 2061732f6b
8 changed files with 12 additions and 12 deletions

View file

@ -2,10 +2,10 @@
on: on:
push: push:
branches: branches:
- master - main
pull_request: pull_request:
branches: branches:
- master - main
name: Run Tox tests name: Run Tox tests
jobs: jobs:

View file

@ -3,7 +3,7 @@ name: Lint Python issues
on: on:
pull_request: pull_request:
branches: [master] branches: [main]
jobs: jobs:
python-lint-job: python-lint-job:

View file

@ -3,7 +3,7 @@ name: Lint Shell issues
on: on:
pull_request: pull_request:
branches: [master] branches: [main]
permissions: permissions:
contents: read contents: read

View file

@ -25,4 +25,4 @@ jobs:
metadata: metadata:
owner: "@rpm-software-management" owner: "@rpm-software-management"
project: "tito" project: "tito"
branch: master branch: main

View file

@ -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 First install Tito's dependencies for your architecture, i.e. `x86_64`, like
described in [README's INSTALL section](README.md#INSTALL), under installation 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: Then create a virtual environment and install tito in editable mode:

View file

@ -56,12 +56,12 @@ From [PyPI](https://pypi.org/project/tito/):
pip install 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 copr enable @rpm-software-management/tito
dnf install 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`: - First install Tito's dependencies for your architecture, i.e. `x86_64`:
@ -69,14 +69,14 @@ From git's `master` branch:
$(dnf repoquery --arch x86_64,noarch --requires tito --resolve -q) $(dnf repoquery --arch x86_64,noarch --requires tito --resolve -q)
_NOTE: This will install Tito's dependencies from Tito's latest release for _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._ be installed manually._
- Then install Tito via so-called [User install]( - Then install Tito via so-called [User install](
https://pip.pypa.io/en/stable/user_guide/#user-installs) (i.e. isolated to the https://pip.pypa.io/en/stable/user_guide/#user-installs) (i.e. isolated to the
current user): 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 To make an rpm of tito to install elsewhere

View file

@ -5,7 +5,7 @@
If you are releasing a new version of Tito, please follow these steps: If you are releasing a new version of Tito, please follow these steps:
1. Make sure Travis tests are passing 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 currently supported Fedora versions. Either by using [mock][mock], or using
Copr `tito release copr --test` Copr `tito release copr --test`
3. Make sure that `[fedora]` releaser in `.tito/releasers.conf` contains all 3. Make sure that `[fedora]` releaser in `.tito/releasers.conf` contains all

2
tito
View file

@ -6,7 +6,7 @@ run_python=${PYTHON-python3}
echo >&2 "\ echo >&2 "\
Warning: Running Tito from a git repository is not supported. Warning: Running Tito from a git repository is not supported.
If you are not a developer working on Tito code, please install it properly 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 export PYTHONPATH