From 2061732f6be9f1f2388ee32f7d320071df988bf8 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Mon, 22 Apr 2024 18:24:42 +0200 Subject: [PATCH] Rename master branch to main Fix #438 --- .github/workflows/fedora-tox.yml | 4 ++-- .github/workflows/python-diff-lint.yml | 2 +- .github/workflows/shell-diff-lint.yml | 2 +- .packit.yml | 2 +- HACKING.md | 2 +- doc/index.md | 8 ++++---- doc/maintenance.md | 2 +- tito | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/fedora-tox.yml b/.github/workflows/fedora-tox.yml index 805160f..c2532dc 100644 --- a/.github/workflows/fedora-tox.yml +++ b/.github/workflows/fedora-tox.yml @@ -2,10 +2,10 @@ on: push: branches: - - master + - main pull_request: branches: - - master + - main name: Run Tox tests jobs: diff --git a/.github/workflows/python-diff-lint.yml b/.github/workflows/python-diff-lint.yml index ae592f5..430173d 100644 --- a/.github/workflows/python-diff-lint.yml +++ b/.github/workflows/python-diff-lint.yml @@ -3,7 +3,7 @@ name: Lint Python issues on: pull_request: - branches: [master] + branches: [main] jobs: python-lint-job: diff --git a/.github/workflows/shell-diff-lint.yml b/.github/workflows/shell-diff-lint.yml index e343f6c..42a0ee1 100644 --- a/.github/workflows/shell-diff-lint.yml +++ b/.github/workflows/shell-diff-lint.yml @@ -3,7 +3,7 @@ name: Lint Shell issues on: pull_request: - branches: [master] + branches: [main] permissions: contents: read diff --git a/.packit.yml b/.packit.yml index be02b11..a5a6cfd 100644 --- a/.packit.yml +++ b/.packit.yml @@ -25,4 +25,4 @@ jobs: metadata: owner: "@rpm-software-management" project: "tito" - branch: master + branch: main diff --git a/HACKING.md b/HACKING.md index c761fa7..e0197c3 100644 --- a/HACKING.md +++ b/HACKING.md @@ -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: diff --git a/doc/index.md b/doc/index.md index e42f75a..aa8f424 100644 --- a/doc/index.md +++ b/doc/index.md @@ -56,12 +56,12 @@ 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`: @@ -69,14 +69,14 @@ From git's `master` branch: $(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 diff --git a/doc/maintenance.md b/doc/maintenance.md index 8df2b8f..e7a6f28 100644 --- a/doc/maintenance.md +++ b/doc/maintenance.md @@ -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 diff --git a/tito b/tito index 0d9a4a2..929a06b 100755 --- a/tito +++ b/tito @@ -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