From daf7da1b61cb774f036b0f848b1e653fe6c9f39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Willi=20Sch=C3=B6nborn?= Date: Tue, 22 Sep 2020 21:11:58 +0200 Subject: [PATCH] Switched from master to main branch --- .github/CONTRIBUTING.md | 2 +- .github/workflows/build.yaml | 4 ++-- README.md | 6 +++--- release.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f42d75e..aaf2397 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ ## Pull requests only -**DON'T** push to the master branch directly. Always use feature branches and let people discuss changes in pull requests. +**DON'T** push to the main branch directly. Always use feature branches and let people discuss changes in pull requests. Pull requests should only be merged after all discussions have been concluded and at least 1 reviewer has given their **approval**. diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3406704..dee387a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,10 +3,10 @@ name: build on: pull_request: branches: - - master + - main push: branches: - - master + - main schedule: - cron: "0 6 * * *" diff --git a/README.md b/README.md index c53047d..f27de8b 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ [![Stability: Sustained](https://masterminds.github.io/stability/sustained.svg)](https://masterminds.github.io/stability/sustained.html) ![Build Status](https://github.com/zalando/problem/workflows/build/badge.svg) -[![Coverage Status](https://img.shields.io/coveralls/zalando/problem/master.svg)](https://coveralls.io/r/zalando/problem) -[![Code Quality](https://img.shields.io/codacy/grade/fff557c57a9345d1afba5cc234cfbbd7/master.svg)](https://www.codacy.com/app/whiskeysierra/problem) +[![Coverage Status](https://img.shields.io/coveralls/zalando/problem/main.svg)](https://coveralls.io/r/zalando/problem) +[![Code Quality](https://img.shields.io/codacy/grade/fff557c57a9345d1afba5cc234cfbbd7/main.svg)](https://www.codacy.com/app/whiskeysierra/problem) [![Javadoc](http://javadoc.io/badge/org.zalando/problem.svg)](http://www.javadoc.io/doc/org.zalando/problem) [![Release](https://img.shields.io/github/release/zalando/problem.svg)](https://github.com/zalando/problem/releases) [![Maven Central](https://img.shields.io/maven-central/v/org.zalando/problem.svg)](https://maven-badges.herokuapp.com/maven-central/org.zalando/problem) -[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/zalando/problem/master/LICENSE) +[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/zalando/problem/main/LICENSE) > **Problem** noun, /ˈpɹɒbləm/: A difficulty that has to be resolved or dealt with. diff --git a/release.sh b/release.sh index 12e68ec..42a9977 100755 --- a/release.sh +++ b/release.sh @@ -20,5 +20,5 @@ git commit -am "Development ${next}-SNAPSHOT" git push git push --tags -git checkout master +git checkout main git branch -D release/${release}