Skip to content

Commit

Permalink
Change branch master to main (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
adangel authored Sep 19, 2024
1 parent cddd7d1 commit f6ad125
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 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
3 changes: 1 addition & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- master
tags:
- '**'
pull_request:
Expand Down Expand Up @@ -37,7 +36,7 @@ jobs:
run: |
echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
echo "MAVEN_OPTS=-Dmaven.wagon.httpconnectionManager.ttlSeconds=180 -Dmaven.wagon.http.retryHandler.count=3" >> $GITHUB_ENV
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/master/scripts" >> $GITHUB_ENV
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/26/scripts" >> $GITHUB_ENV
- name: Check Environment
shell: bash
run: |
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ BlueJ's extension2 directory.

### Releasing a new version

* Update [ReleaseNotes.md](https://github.com/pmd/pmd-bluej/blob/master/ReleaseNotes.md)
* Update [ReleaseNotes.md](https://github.com/pmd/pmd-bluej/blob/main/ReleaseNotes.md)
with new version a release date
* Update the version: `./mvnw versions:set -DnewVersion=2.2.0`
* Commit: `git commit -a -m "Prepare new version 2.2.0"`
* Tag: `git tag 2.2.0`
* Push: `git push origin master; git push origin tag 2.2.0`
* Push: `git push origin main; git push origin tag 2.2.0`
* The tag will be built by [Github Actions](https://github.com/pmd/pmd-bluej/actions?query=workflow%3Abuild).
* After it is done, a new release including the jar file should be available here:
* <https://github.com/pmd/pmd-bluej/releases>
* <https://sourceforge.net/projects/pmd/files/pmd-bluej/>
* Update the version: `./mvnw versions:set -DnewVersion=2.3.0-SNAPSHOT`
* Update [ReleaseNotes.md](https://github.com/pmd/pmd-bluej/blob/master/ReleaseNotes.md)
* Update [ReleaseNotes.md](https://github.com/pmd/pmd-bluej/blob/main/ReleaseNotes.md)
and add a placeholder for the next version
* Commit: `git commit -a -m "Prepare next development version 2.3.0-SNAPSHOT"`
* Push: `git push origin master`
* Push: `git push origin main`
* Post a news on <https://sourceforge.net/p/pmd/news/>.
7 changes: 7 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## ??-????-???? - 5.0.2

* 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.

## 26-January-2024 - 5.0.1

* Support PMD 7 (in addition to PMD 6)
Expand Down

0 comments on commit f6ad125

Please sign in to comment.