Skip to content

Commit 3fb3cb7

Browse files
authored
Change branch master to main (#93)
1 parent c367755 commit 3fb3cb7

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

.ci/inc/fetch_ci_scripts.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function fetch_ci_scripts() {
44
local inc_dir
55
local inc_url
66
inc_dir="$(dirname "$0")/inc"
7-
inc_url="${PMD_CI_SCRIPTS_URL:-https://raw.githubusercontent.com/pmd/build-tools/master/scripts}/inc"
7+
inc_url="${PMD_CI_SCRIPTS_URL:-https://raw.githubusercontent.com/pmd/build-tools/main/scripts}/inc"
88

99
mkdir -p "${inc_dir}"
1010

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ on:
33
push:
44
branches:
55
- main
6-
- master
76
tags:
87
- '**'
98
pull_request:

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@
22

33
## Unreleased
44

5+
**New Git default branch - "main"**
6+
7+
We are joining the Git community and updating "master" to "main". Using the term "master" for the main
8+
development branch can be offensive to some people. Existing versions of Git have been always capable of
9+
working with any branch name and since 2.28.0 (July 2020) the default initial branch is configurable
10+
(`init.defaultBranch`). Since October 2020, the default branch for new repositories on GitHub
11+
is "main". Finally, PMD will also use this new name for the main branch in all our own repositories.
12+
513
**Fixed issues:**
614

715
**Merged pull requests:**
816

17+
* [#93](https://github.com/pmd/pmd-designer/pull/93) Change branch master to main by [@adangel](https://github.com/adangel)
18+
919
See https://github.com/pmd/pmd-designer/milestone/16
1020

1121
## 7.2.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PMD Rule Designer
22

3-
[![Build Status](https://github.com/pmd/pmd-designer/workflows/build/badge.svg?branch=master)](https://github.com/pmd/pmd-designer/actions?query=workflow%3Abuild)
3+
[![Build Status](https://github.com/pmd/pmd-designer/workflows/build/badge.svg?branch=main)](https://github.com/pmd/pmd-designer/actions?query=workflow%3Abuild)
44
[![Maven Central](https://img.shields.io/maven-central/v/net.sourceforge.pmd/pmd-designer.svg)](https://maven-badges.herokuapp.com/maven-central/net.sourceforge.pmd/pmd-designer)
55
[![Join the chat](https://img.shields.io/gitter/room/pmd/pmd-designer)](https://app.gitter.im/#/room/#pmd_pmd-designer:gitter.im?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
66

releasing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Releasing pmd-designer
22

3-
1. Checkout master branch:
3+
1. Checkout main branch:
44

55
``` shell
66
git clone https://github.com/pmd/pmd-designer.git
@@ -19,7 +19,7 @@
1919
Note: the tag will be pushed automatically.
2020

2121
``` shell
22-
git switch master
22+
git switch main
2323
./mvnw release:clean
2424
./mvnw release:prepare
2525
```

0 commit comments

Comments
 (0)