Skip to content

Commit

Permalink
Migrate to main as the default branch name (#262)
Browse files Browse the repository at this point in the history
  • Loading branch information
LawnGnome authored Aug 21, 2020
1 parent c5a7ae0 commit 3b630c7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
###################################### READ ME ###########################################
### This changelog should always be read on `master` branch. Its contents on version ###
### This changelog should always be read on `main` branch. Its contents on version ###
### branches do not necessarily reflect the changes that have gone into that branch. ###
##########################################################################################
-->
Expand All @@ -11,6 +11,10 @@ All notable changes to `src-cli` are documented in this file.

## Unreleased changes

### Changed

- The default branch for the `src-cli` project has been changed to `main`. [#262](https://github.com/sourcegraph/src-cli/pull/262)

### Fixed

- `src campaigns` output has been improved in the Windows console. [#274](https://github.com/sourcegraph/src-cli/pull/274)
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ go install ./cmd/src

## Releasing

1. If this is a non-patch release, update the changelog. Add a new section `## $MAJOR.MINOR` to [`CHANGELOG.md`](https://github.com/sourcegraph/src-cli/blob/master/CHANGELOG.md#unreleased) immediately under `## Unreleased changes`. Add new empty `Added`, `Changed`, `Fixed`, and `Removed` sections under `## Unreleased changes`.
1. If this is a non-patch release, update the changelog. Add a new section `## $MAJOR.MINOR` to [`CHANGELOG.md`](https://github.com/sourcegraph/src-cli/blob/main/CHANGELOG.md#unreleased) immediately under `## Unreleased changes`. Add new empty `Added`, `Changed`, `Fixed`, and `Removed` sections under `## Unreleased changes`.
1. Find the latest version (either via the releases tab on GitHub or via git tags) to determine which version you are releasing.
2. `VERSION=9.9.9 ./release.sh` (replace `9.9.9` with the version you are releasing)
3. Travis will automatically perform the release. Once it has finished, **confirm that the curl commands fetch the latest version above**.
4. Update the `MinimumVersion` constant in the [src-cli package](https://github.com/sourcegraph/sourcegraph/tree/master/internal/src-cli/consts.go).
4. Update the `MinimumVersion` constant in the [src-cli package](https://github.com/sourcegraph/sourcegraph/tree/main/internal/src-cli/consts.go).

### Patch releases

Expand Down

0 comments on commit 3b630c7

Please sign in to comment.