From cfe3c3ffab46eb004adf294ae9d998f76b2740d1 Mon Sep 17 00:00:00 2001 From: Martin Meyerhoff Date: Fri, 16 Jun 2023 10:39:59 +0200 Subject: [PATCH] Switch to main branch This changes all references to the `master` branch in the repository to `main` in anticipation of changing the default branch on the repo to `main`. --- .mergify.yml | 4 ++-- README.md | 4 ++-- lib/solidus_dev_support/extension.rb | 2 +- .../templates/extension/CONTRIBUTING.md | 10 +++++----- lib/solidus_dev_support/templates/extension/README.md | 2 +- spec/lib/extension_spec.rb | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 3c9073a9..ce60824b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,7 +1,7 @@ pull_request_rules: - name: request changelog labels when a PR is missing them conditions: - - base=master + - base=main - -label=bug - -label=enhancement - -label=documentation @@ -31,7 +31,7 @@ pull_request_rules: Once the correct labels have been set, simply remove the `needs changelog label` label from this PR so I can merge it. - name: merge PRs automatically conditions: - - base=master + - base=main - -label="needs changelog label" - -label=blocked - "#approved-reviews-by>=1" diff --git a/README.md b/README.md index 675e185e..4f4c51e9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CircleCI](https://circleci.com/gh/solidusio/solidus_dev_support.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_dev_support) -[![codecov](https://codecov.io/gh/solidusio/solidus_dev_support/branch/master/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_dev_support) +[![codecov](https://codecov.io/gh/solidusio/solidus_dev_support/branch/main/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_dev_support) This gem contains common development functionality for Solidus extensions. @@ -192,7 +192,7 @@ The above command will: * bump the gem version to the next minor (you can also use `patch`, `major` or a specific version number); -* commit the change and push it to `origin/master`; +* commit the change and push it to `origin/main`; * create a Git tag; * push the tag to the `origin` remote; * release the new version on RubyGems. diff --git a/lib/solidus_dev_support/extension.rb b/lib/solidus_dev_support/extension.rb index d192ebd2..7e54b69d 100644 --- a/lib/solidus_dev_support/extension.rb +++ b/lib/solidus_dev_support/extension.rb @@ -79,7 +79,7 @@ def default_gemspec gem.license = 'BSD-3-Clause' gem.metadata['homepage_uri'] = gem.homepage = "https://github.com/#{repo}#readme" - gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/master/CHANGELOG.md" + gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/main/CHANGELOG.md" gem.metadata['source_code_uri'] = "https://github.com/#{repo}" end end diff --git a/lib/solidus_dev_support/templates/extension/CONTRIBUTING.md b/lib/solidus_dev_support/templates/extension/CONTRIBUTING.md index d2a45817..3e489c4a 100644 --- a/lib/solidus_dev_support/templates/extension/CONTRIBUTING.md +++ b/lib/solidus_dev_support/templates/extension/CONTRIBUTING.md @@ -16,13 +16,13 @@ follow so that we can have a chance of keeping on top of things. ## Making Changes * Create a topic branch from where you want to base your work. - * This is usually the master branch. + * This is usually the main branch. * Only target release branches if you are certain your fix must be on that branch. - * To quickly create a topic branch based on master; `git branch - fix/master/my_contribution master` then checkout the new branch with `git - checkout fix/master/my_contribution`. Please avoid working directly on the - `master` branch. + * To quickly create a topic branch based on main; `git branch + fix/main/my_contribution main` then checkout the new branch with `git + checkout fix/main/my_contribution`. Please avoid working directly on the + `main` branch. * Make commits of logical units. * Check for unnecessary whitespace with `git diff --check` before committing. * Make sure your commit messages are in the proper format. diff --git a/lib/solidus_dev_support/templates/extension/README.md b/lib/solidus_dev_support/templates/extension/README.md index 51875e87..29c7a37c 100644 --- a/lib/solidus_dev_support/templates/extension/README.md +++ b/lib/solidus_dev_support/templates/extension/README.md @@ -1,7 +1,7 @@ # <%= class_name.gsub(/(?<=[^A-Z])([A-Z])/, ' \1') %> [![CircleCI](https://circleci.com/gh/<%= repo %>.svg?style=shield)](https://circleci.com/gh/<%= repo %>) -[![codecov](https://codecov.io/gh/<%= repo %>/branch/master/graph/badge.svg)](https://codecov.io/gh/<%= repo %>) +[![codecov](https://codecov.io/gh/<%= repo %>/branch/main/graph/badge.svg)](https://codecov.io/gh/<%= repo %>) diff --git a/spec/lib/extension_spec.rb b/spec/lib/extension_spec.rb index f79932f8..08f09a16 100644 --- a/spec/lib/extension_spec.rb +++ b/spec/lib/extension_spec.rb @@ -61,7 +61,7 @@ expect(subject.gemspec.description).to eq('TODO: Write a longer description or delete this line.') expect(subject.gemspec.license).to eq('BSD-3-Clause') expect(subject.gemspec.homepage).to eq("https://github.com/solidusio-contrib/solidus_my_ext#readme") - expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/master/CHANGELOG.md") + expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/main/CHANGELOG.md") expect(subject.gemspec.metadata['source_code_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext") end end