replace master with main (#111)

Co-authored-by: Evgeny Pestov <evgeny.pestov@mambu.com>
tilt-dev · Jun 7, 2021 · c24e36d · c24e36d
1 parent 5764c06
commit c24e36d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
       - run: cd .. && go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.38.0
       - run: make golangci-lint
       - slack/notify-on-failure:
-          only_for_branches: master
+          only_for_branches: main
 
   e2e-remote-docker:
     docker:
@@ -56,7 +56,7 @@ jobs:
           go get -v -t -d ./...
           test/e2e.sh
       - slack/notify-on-failure:
-          only_for_branches: master
+          only_for_branches: main
 
   release-dry-run:
     docker:
@@ -70,7 +70,7 @@ jobs:
       - run: sudo mv ./bin/goreleaser /usr/local/bin/
       - run: goreleaser --rm-dist --skip-publish --snapshot
       - slack/notify-on-failure:
-          only_for_branches: master
+          only_for_branches: main
 
   release:
     docker:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ make e2e
 ### Release
 
 CircleCI will automatically build ctlptl releases when you push
-a new tag to master.
+a new tag to main.
 
 ```
 git pull origin main

diff --git a/cmd/ctlptl/main.go b/cmd/ctlptl/main.go
@@ -55,7 +55,7 @@ func versionStamp() string {
 	}
 
 	if version == "" {
-		version = "0.0.0-master"
+		version = "0.0.0-main"
 	}
 
 	return fmt.Sprintf("v%s, built %s", version, date)