diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2259cb0..f23f51e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: push: branches: - - master + - main pull_request: schedule: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 19c9c25..f15a595 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: docs on: push: branches: - - master + - main paths: - "**/*.md" pull_request: diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index db37517..8a254a8 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -3,7 +3,7 @@ name: rubocop on: push: branches: - - master + - main pull_request: jobs: diff --git a/.rubocop.yml b/.rubocop.yml index 8a75458..7a0624a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,7 +9,7 @@ inherit_gem: AllCops: Exclude: - "bin/*" - TargetRubyVersion: 2.5 + TargetRubyVersion: 3.0 NewCops: enable ############### Layout ############### diff --git a/README.md b/README.md index cc9cfb3..19b8d61 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Send `Capistrano` deployment status to `Slack` via the Incoming Webhooks integra ## Requirements -- Ruby >= 2.5 +- Ruby >= 3.0 - Capistrano ~> 3.0 - Slack @@ -90,10 +90,10 @@ set :slacky, false This library aims to support and is [tested against][2] the following Ruby implementations: -- Ruby 2.5 -- Ruby 2.6 -- Ruby 2.7 - Ruby 3.0 +- Ruby 3.1 +- Ruby 3.2 +- Ruby 3.3 If something doesn't work on one of these Ruby versions, it's a bug. diff --git a/capistrano-slacky.gemspec b/capistrano-slacky.gemspec index e729116..8257cb8 100644 --- a/capistrano-slacky.gemspec +++ b/capistrano-slacky.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/chubchenko/capistrano-slacky" spec.metadata = { "bug_tracker_uri" => "https://github.com/chubchenko/capistrano-slacky/issues", - "changelog_uri" => "https://github.com/chubchenko/capistrano-slacky/blob/master/CHANGELOG.md", + "changelog_uri" => "https://github.com/chubchenko/capistrano-slacky/blob/main/CHANGELOG.md", "homepage_uri" => spec.homepage, "source_code_uri" => "https://github.com/chubchenko/capistrano-slacky", "github_repo" => "ssh://github.com/chubchenko/capistrano-slacky" diff --git a/spec/capistrano/slacky/facade/body_spec.rb b/spec/capistrano/slacky/facade/body_spec.rb index ced0707..26513e9 100644 --- a/spec/capistrano/slacky/facade/body_spec.rb +++ b/spec/capistrano/slacky/facade/body_spec.rb @@ -19,7 +19,7 @@ type: :mrkdwn, text: ">*Branch:*" }, { - type: :mrkdwn, text: "`master`" + type: :mrkdwn, text: "`main`" }, { type: :mrkdwn, text: ">*Duration:*" diff --git a/spec/capistrano/slacky/messaging/default_spec.rb b/spec/capistrano/slacky/messaging/default_spec.rb index 3df5b42..d87caaf 100644 --- a/spec/capistrano/slacky/messaging/default_spec.rb +++ b/spec/capistrano/slacky/messaging/default_spec.rb @@ -34,7 +34,7 @@ {type: :mrkdwn, text: ">*Stage:*"}, {type: :mrkdwn, text: "`production`"}, {type: :mrkdwn, text: ">*Branch:*"}, - {type: :mrkdwn, text: "`master`"}, + {type: :mrkdwn, text: "`main`"}, {type: :mrkdwn, text: ">*Duration:*"}, {type: :mrkdwn, text: a_string_matching(/`\d{2}:\d{2}`/)} ] @@ -99,7 +99,7 @@ {type: :mrkdwn, text: ">*Stage:*"}, {type: :mrkdwn, text: "`production`"}, {type: :mrkdwn, text: ">*Branch:*"}, - {type: :mrkdwn, text: "`master`"}, + {type: :mrkdwn, text: "`main`"}, {type: :mrkdwn, text: ">*Duration:*"}, {type: :mrkdwn, text: a_string_matching(/`\d{2}:\d{2}`/)} ] @@ -159,7 +159,7 @@ {type: :mrkdwn, text: ">*Stage:*"}, {type: :mrkdwn, text: "`production`"}, {type: :mrkdwn, text: ">*Branch:*"}, - {type: :mrkdwn, text: "`master`"}, + {type: :mrkdwn, text: "`main`"}, {type: :mrkdwn, text: ">*Duration:*"}, {type: :mrkdwn, text: a_string_matching(/`\d{2}:\d{2}`/)} ] @@ -201,7 +201,7 @@ {type: :mrkdwn, text: ">*Stage:*"}, {type: :mrkdwn, text: "`production`"}, {type: :mrkdwn, text: ">*Branch:*"}, - {type: :mrkdwn, text: "`master`"}, + {type: :mrkdwn, text: "`main`"}, {type: :mrkdwn, text: ">*Duration:*"}, {type: :mrkdwn, text: a_string_matching(/`\d{2}:\d{2}`/)} ] diff --git a/spec/support/config/capistrano.rb b/spec/support/config/capistrano.rb index 36d09c2..aa0c954 100644 --- a/spec/support/config/capistrano.rb +++ b/spec/support/config/capistrano.rb @@ -16,7 +16,7 @@ # Set the branch name to be deployed from SCM. Capistrano::Configuration.env.set( - :branch, "master" + :branch, "main" ) # Set the user name.