From 903dbae6d596782ca78cfee56d022a65dce6ba41 Mon Sep 17 00:00:00 2001 From: Christian Compton Date: Wed, 10 Feb 2021 16:08:39 -0600 Subject: [PATCH] fix(build): main migration (#93) --- .travis.yml | 2 +- CONTRIBUTING.md | 2 +- README.md | 4 ++-- build/publishCodeCoverage.sh | 4 ++-- v5/core/doc.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e36f60..c75b10e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,4 +41,4 @@ deploy: script: npx semantic-release skip_cleanup: true on: - branch: master + branch: main diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 97bb85b..8806aff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,7 +67,7 @@ If you want to contribute to the repository, here's a quick guide: 9. Commit your changes: * Commit messages should follow the Angular commit message guidelines as mentioned above. - 10. Push your commit(s) to your fork and submit a pull request to the **master** branch. + 10. Push your commit(s) to your fork and submit a pull request to the **main** branch. # Developer's Certificate of Origin 1.1 diff --git a/README.md b/README.md index 8830a50..7eb4643 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![Build Status](https://travis-ci.com/IBM/go-sdk-core.svg?branch=master)](https://travis-ci.com/IBM/go-sdk-core) +[![Build Status](https://travis-ci.com/IBM/go-sdk-core.svg?branch=main)](https://travis-ci.com/IBM/go-sdk-core) [![Release](https://img.shields.io/github/v/release/IBM/go-sdk-core)](https://github.com/IBM/go-sdk-core/releases/latest) ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/IBM/go-sdk-core?filename=v5/go.mod) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -[![codecov](https://codecov.io/gh/IBM/go-sdk-core/branch/master/graph/badge.svg)](https://codecov.io/gh/IBM/go-sdk-core) +[![codecov](https://codecov.io/gh/IBM/go-sdk-core/branch/main/graph/badge.svg)](https://codecov.io/gh/IBM/go-sdk-core) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![CLA assistant](https://cla-assistant.io/readme/badge/ibm/go-sdk-core)](https://cla-assistant.io/ibm/go-sdk-core) diff --git a/build/publishCodeCoverage.sh b/build/publishCodeCoverage.sh index de0fba4..e5967da 100755 --- a/build/publishCodeCoverage.sh +++ b/build/publishCodeCoverage.sh @@ -1,9 +1,9 @@ #!/bin/bash -# This script will publish code coverage info for a build of the master branch +# This script will publish code coverage info for a build of the main branch # or a tagged release. -if [[ -n "${TRAVIS_TAG}" || "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then +if [[ -n "${TRAVIS_TAG}" || "${TRAVIS_BRANCH}" == "main" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then printf ">>>>> Publishing code coverage info for branch: %s\n" ${TRAVIS_BRANCH} $HOME/codecov-bash.sh -f v5/coverage.txt -t $CODECOV_TOKEN else diff --git a/v5/core/doc.go b/v5/core/doc.go index d4a65a4..5c9d60b 100644 --- a/v5/core/doc.go +++ b/v5/core/doc.go @@ -29,7 +29,7 @@ The authentication types that are appropriate for a particular service may vary from service to service. Each authentication type is implemented as an Authenticator for consumption by a service. To read more about authenticators and how to use them see here: -https://github.com/IBM/go-sdk-core/blob/master/Authentication.md +https://github.com/IBM/go-sdk-core/blob/main/Authentication.md Services