Skip to content

Commit

Permalink
fix(build): transition default branch master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
padamstx committed Feb 9, 2021
1 parent cdb4ed1 commit 1fc1925
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"debug": true,
"tagFormat": "${version}",
"branches": [ "main" ],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
stages:
- name: Build-Test
- name: Semantic-Release
if: branch = master AND type = push AND fork = false
if: branch = main AND type = push AND fork = false
- name: Publish-Release
if: tag IS present

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Before that, please search for similar issues. It's possible that someone has al

# General Information
For general guidance on contributing to this project, please see
[this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/master/CONTRIBUTING_java.md)
[this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/main/CONTRIBUTING_java.md)
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[![Build Status](https://travis-ci.com/IBM/platform-services-java-sdk.svg?branch=master)](https://travis-ci.com/IBM/platform-services-java-sdk)
[![Build Status](https://travis-ci.com/IBM/platform-services-java-sdk.svg?branch=main)](https://travis-ci.com/IBM/platform-services-java-sdk)
[![Javadoc](https://img.shields.io/static/v1?label=javadoc&message=latest&color=blue)](https://ibm.github.io/platform-services-java-sdk/docs/latest)
[![Release](https://img.shields.io/github/v/release/IBM/platform-services-java-sdk)](https://github.com/IBM/platform-services-java-sdk/releases/latest)
[![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/platform-services-java-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/IBM/platform-services-java-sdk)
[![codecov](https://codecov.io/gh/IBM/platform-services-java-sdk/branch/main/graph/badge.svg)](https://codecov.io/gh/IBM/platform-services-java-sdk)
[![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)


Expand Down Expand Up @@ -106,7 +106,7 @@ artifact coordinates (group id, artifact id and version) for the service, like t
```

## Using the SDK
For general SDK usage information, please see [this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/master/README.md)
For general SDK usage information, please see [this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/main/README.md)

## Questions

Expand Down
4 changes: 2 additions & 2 deletions build/publishCodeCoverage.sh
Original file line number Diff line number Diff line change
@@ -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 -s modules/coverage-reports/target/site/jacoco-aggregate -t $CODECOV_TOKEN
else
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<scm>
<connection>scm:git:https://github.com/IBM/platform-services-java-sdk</connection>
<developerConnection>scm:git:https://github.com/IBM/platform-services-java-sdk</developerConnection>
<url>https://github.com/IBM/platform-services-java-sdk/tree/master</url>
<url>https://github.com/IBM/platform-services-java-sdk/tree/main</url>
</scm>

<issueManagement>
Expand Down

0 comments on commit 1fc1925

Please sign in to comment.