From 29b720398f665db505412bb0ec62d13a4c01750e Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Thu, 11 Feb 2021 10:20:11 +0100 Subject: [PATCH] fix: rename master branch to main --- .github/workflows/pr.yml | 2 +- .github/workflows/prod.yml | 2 +- README.md | 2 +- config/deploy.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 37fa0189d..9db89f10d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,7 +4,7 @@ on: pull_request: branches: - develop - - master + - main jobs: tsc: diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index dd741654b..265403a8b 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -2,7 +2,7 @@ name: Prod on: push: - branches: [ master ] + branches: [ main ] jobs: diff --git a/README.md b/README.md index 59942c95c..f7a3ea668 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Standard Notes is a simple and private notes app available on most platforms, in
[![latest release version](https://img.shields.io/github/v/release/standardnotes/desktop)](https://github.com/standardnotes/desktop/releases) -[![License](https://img.shields.io/github/license/standardnotes/web?color=blue)](https://github.com/standardnotes/web/blob/master/LICENSE) +[![License](https://img.shields.io/github/license/standardnotes/web?color=blue)](https://github.com/standardnotes/web/blob/main/LICENSE) [![Slack](https://img.shields.io/badge/slack-standardnotes-CC2B5E.svg?style=flat&logo=slack)](https://standardnotes.org/slack) [![Twitter Follow](https://img.shields.io/badge/follow-%40standardnotes-blue.svg?style=flat&logo=twitter)](https://twitter.com/standardnotes) diff --git a/config/deploy.rb b/config/deploy.rb index a6704f522..4db44cb86 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -4,7 +4,7 @@ set :application, 'standard-notes' set :repo_url, CAP_CONFIG["default"]["repo_url"] # Default branch is :master -# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp +set :branch, `git rev-parse --abbrev-ref main`.chomp # Default deploy_to directory is /var/www/my_app_name # set :deploy_to, '/var/www/my_app_name'