Skip to content

Commit

Permalink
Change branch master to main (#93)
Browse files Browse the repository at this point in the history
  • Loading branch information
adangel committed Sep 19, 2024
1 parent c367755 commit 3fb3cb7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .ci/inc/fetch_ci_scripts.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function fetch_ci_scripts() {
local inc_dir
local inc_url
inc_dir="$(dirname "$0")/inc"
inc_url="${PMD_CI_SCRIPTS_URL:-https://raw.githubusercontent.com/pmd/build-tools/master/scripts}/inc"
inc_url="${PMD_CI_SCRIPTS_URL:-https://raw.githubusercontent.com/pmd/build-tools/main/scripts}/inc"

mkdir -p "${inc_dir}"

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- main
- master
tags:
- '**'
pull_request:
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@

## Unreleased

**New Git default branch - "main"**

We are joining the Git community and updating "master" to "main". Using the term "master" for the main
development branch can be offensive to some people. Existing versions of Git have been always capable of
working with any branch name and since 2.28.0 (July 2020) the default initial branch is configurable
(`init.defaultBranch`). Since October 2020, the default branch for new repositories on GitHub
is "main". Finally, PMD will also use this new name for the main branch in all our own repositories.

**Fixed issues:**

**Merged pull requests:**

* [#93](https://github.com/pmd/pmd-designer/pull/93) Change branch master to main by [@adangel](https://github.com/adangel)

See https://github.com/pmd/pmd-designer/milestone/16

## 7.2.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PMD Rule Designer

[![Build Status](https://github.com/pmd/pmd-designer/workflows/build/badge.svg?branch=master)](https://github.com/pmd/pmd-designer/actions?query=workflow%3Abuild)
[![Build Status](https://github.com/pmd/pmd-designer/workflows/build/badge.svg?branch=main)](https://github.com/pmd/pmd-designer/actions?query=workflow%3Abuild)
[![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)
[![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)

Expand Down
4 changes: 2 additions & 2 deletions releasing.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Releasing pmd-designer

1. Checkout master branch:
1. Checkout main branch:

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

``` shell
git switch master
git switch main
./mvnw release:clean
./mvnw release:prepare
```
Expand Down

0 comments on commit 3fb3cb7

Please sign in to comment.