Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master => main doc fixes #511

Merged
merged 1 commit into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Analysis

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
schedule:
- cron: 13 7 * * 6

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Test

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

concurrency:
group: ${{ github.ref }}-test
Expand Down
10 changes: 5 additions & 5 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,15 @@ 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
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
Expand Down
2 changes: 1 addition & 1 deletion semian.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down