diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index fd92c87c..5d416143 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -4,9 +4,9 @@ name: Analysis on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] schedule: - cron: 13 7 * * 6 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d338368e..d41edc00 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,9 +4,9 @@ name: Test on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] concurrency: group: ${{ github.ref }}-test diff --git a/RELEASE.md b/RELEASE.md index b2902504..14ba3ea8 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,15 +10,15 @@ Ensure your local workstation is configured to be able to ### Checkout latest code ```shell -$ git checkout master -$ git pull origin master +$ git checkout main +$ git pull origin main ``` ### Bump version Update version in [`lib/semian/version.rb`](./lib/semian/version.rb). Check if there is required changes in [`README.md`](./README.md). -Add line after `## [Unreleased]` in [`CHANGELOG.md`][./CHANGELOG.md] with new version. +Add line after `## [Unreleased]` in [`CHANGELOG.md`](./CHANGELOG.md) with new version. ### Run Tests @@ -28,7 +28,7 @@ Check [`README.md`](./README.md). ### Create Release Commit and Tag Commit changes and create a tag. Make sure commit and tag are signed. -Extract related content from [`CHANGELOG.md`][./CHANGELOG.md] for a tag message. +Extract related content from [`CHANGELOG.md`](./CHANGELOG.md) for a tag message. ```shell $ bundle install @@ -42,7 +42,7 @@ $ git tag -s "v$RELEASE_VERSION" On your local machine again, push your commit and tag ```shell -$ git push origin master --follow-tags +$ git push origin main --follow-tags ``` ## Verify rubygems release diff --git a/Rakefile b/Rakefile index 4b88835b..7bf32c18 100644 --- a/Rakefile +++ b/Rakefile @@ -151,7 +151,7 @@ task :flamegraph do flamegraph_parse_command = "flamegraph.pl --countname=ms --width=1400" %x(ruby #{script} | #{flamegraph_parse_command} > without_semian.svg) - ["v0.15.0", "v0.16.0", "v0.17.0", "master"].each do |ver| + ["v0.15.0", "v0.16.0", "v0.17.0", "main"].each do |ver| %x(WITH_CIRCUIT_BREAKER_ENABLED=1 SEMIAN_VERSION=#{ver} ruby #{script} \ | #{flamegraph_parse_command} > semian_#{ver}_enabled.svg) end @@ -159,7 +159,7 @@ end desc "Run benchmarks for specific versions" task :benchmark do - ["v0.15.0", "v0.16.0", "v0.17.0", "master"].each do |ver| + ["v0.15.0", "v0.16.0", "v0.17.0", "main"].each do |ver| ruby "scripts/benchmarks/net_http_acquire_benchmarker.rb SEMIAN_VERSION=#{ver}" ruby "scripts/benchmarks/lru_benchmarker.rb SEMIAN_VERSION=#{ver}" end diff --git a/semian.gemspec b/semian.gemspec index 0e986857..ca6a6603 100644 --- a/semian.gemspec +++ b/semian.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.metadata = { "allowed_push_host" => "https://rubygems.org", "bug_tracker_uri" => "https://github.com/Shopify/semian/issues", - "changelog_uri" => "https://github.com/Shopify/semian/blob/master/CHANGELOG.md", + "changelog_uri" => "https://github.com/Shopify/semian/blob/main/CHANGELOG.md", "documentation_uri" => "https://github.com/Shopify/semian", "homepage_uri" => "https://github.com/Shopify/semian", "source_code_uri" => "https://github.com/Shopify/semian",