Skip to content

Commit

Permalink
fixed references to main branch (#114)
Browse files Browse the repository at this point in the history
  • Loading branch information
kristinapathak authored Jul 28, 2020
1 parent 57b4873 commit d6fbf32
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:

branches:
only:
- master
- main
- /^v[0-9]+\.[0-9]+\.[0-9]+$/

script:
Expand All @@ -22,12 +22,12 @@ jobs:
include:
- stage: integration
name: "Integration Tests"
if: branch = master
if: branch = main
script:
- make it
- stage: tag
name: "Tag For Release"
if: branch = master
if: branch = main
before_script:
- echo -e "machine github.com\n login $GH_TOKEN" > ~/.netrc
script:
Expand All @@ -40,7 +40,7 @@ jobs:
- if [[ "$TAG" != "" && "$TAG" != "$OLD_VERSION" ]]; then git tag -a "$TAG" -m "$NOTES"; git push origin --tags; echo $?; fi
- stage: release
name: "Make a Release"
if: branch != master
if: branch != main
script: skip
before_deploy:
- make release-artifacts
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
- Updated references to the main branch [#114](https://github.com/xmidt-org/svalinn/pull/114)

## [v0.14.1]
- add fix for empty sessionID [#112](https://github.com/xmidt-org/gungnir/pull/112)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# gungnir
(pronounced “GUNG-neer”)

[![Build Status](https://travis-ci.com/xmidt-org/gungnir.svg?branch=master)](https://travis-ci.com/xmidt-org/gungnir)
[![codecov.io](http://codecov.io/github/xmidt-org/gungnir/coverage.svg?branch=master)](http://codecov.io/github/xmidt-org/gungnir?branch=master)
[![Build Status](https://travis-ci.com/xmidt-org/gungnir.svg?branch=main)](https://travis-ci.com/xmidt-org/gungnir)
[![codecov.io](http://codecov.io/github/xmidt-org/gungnir/coverage.svg?branch=main)](http://codecov.io/github/xmidt-org/gungnir?branch=main)
[![Code Climate](https://codeclimate.com/github/xmidt-org/gungnir/badges/gpa.svg)](https://codeclimate.com/github/xmidt-org/gungnir)
[![Issue Count](https://codeclimate.com/github/xmidt-org/gungnir/badges/issue_count.svg)](https://codeclimate.com/github/xmidt-org/gungnir)
[![Go Report Card](https://goreportcard.com/badge/github.com/xmidt-org/gungnir)](https://goreportcard.com/report/github.com/xmidt-org/gungnir)
[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/xmidt-org/gungnir/blob/master/LICENSE)
[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/xmidt-org/gungnir/blob/main/LICENSE)
[![GitHub release](https://img.shields.io/github/release/xmidt-org/gungnir.svg)](CHANGELOG.md)


Expand Down Expand Up @@ -129,7 +129,7 @@ WIP. TODO: add info

## Deploy

For deploying on Docker or in Kubernetes, refer to the [deploy README](https://github.com/xmidt-org/codex-deploy/tree/master/deploy/README.md).
For deploying on Docker or in Kubernetes, refer to the [deploy README](https://github.com/xmidt-org/codex-deploy/tree/main/deploy/README.md).

For running locally, ensure you have the binary [built](#Source). If it's in
your `GOPATH`, run:
Expand Down

0 comments on commit d6fbf32

Please sign in to comment.