Skip to content

Commit

Permalink
Merge 01133fd into ab798b5
Browse files Browse the repository at this point in the history
  • Loading branch information
gonzedge committed Feb 19, 2024
2 parents ab798b5 + 01133fd commit 815a926
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Expand Up @@ -14,10 +14,10 @@ name: codeql
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
schedule:
- cron: '45 10 * * 6'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Expand Up @@ -8,7 +8,7 @@ name: dependency-review
on:
pull_request:
branches:
- master
- main

permissions:
contents: read
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ruby.yml
Expand Up @@ -3,10 +3,10 @@ name: build
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

permissions:
contents: read
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
run: bundle exec rspec
- name: Report rspec test coverage to codeclimate.com
uses: paambaati/codeclimate-action@v4.0.0
uses: paambaati/codeclimate-action@v5.0.0
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
with:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/semgrep.yml
Expand Up @@ -5,7 +5,6 @@ on:
push:
branches:
- main
- master
paths:
- .github/workflows/semgrep.yml
schedule:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
@@ -1,6 +1,6 @@
# CHANGELOG

## 2.4.1 [compare][compare_v2_4_0_and_master]
## 2.4.1 [compare][compare_v2_4_0_and_main]

## 2.4.0 [compare][compare_v2_3_1_and_v2_4_0]

Expand Down Expand Up @@ -960,7 +960,7 @@ Most of these help with the gem's overall performance.
[compare_v2_2_1_and_v2_3_0]: https://github.com/gonzedge/rambling-trie/compare/v2.2.1...v2.3.0
[compare_v2_3_0_and_v2_3_1]: https://github.com/gonzedge/rambling-trie/compare/v2.3.0...v2.3.1
[compare_v2_3_1_and_v2_4_0]: https://github.com/gonzedge/rambling-trie/compare/v2.3.1...v2.4.0
[compare_v2_4_0_and_master]: https://github.com/gonzedge/rambling-trie/compare/v2.4.0...master
[compare_v2_4_0_and_main]: https://github.com/gonzedge/rambling-trie/compare/v2.4.0...main
[design_patterns_null_object]: http://wiki.c2.com/?NullObject
[github_commit_current_key_less_memory]: https://github.com/gonzedge/rambling-trie/commit/218fac218a77e70ba04a3672ff5abfddf6544f57
[github_commit_reduced_memory_footprint]: https://github.com/gonzedge/rambling-trie/commit/aa8c0262f888e88df6a2f1e1351d8f14b21e43c4
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -19,10 +19,10 @@

```sh
git remote add upstream git@github.com:gonzedge/rambling-trie.git
git checkout master
git checkout main
git pull upstream
git checkout my-feature-branch
git rebase master
git rebase main
git push --set-upstream origin my-feature-branch
```

Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -327,13 +327,13 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
[github_action_codeql_badge]: https://github.com/gonzedge/rambling-trie/actions/workflows/codeql.yml/badge.svg
[github_action_codeql_link]: https://github.com/gonzedge/rambling-trie/actions/workflows/codeql.yml
[github_user_gonzedge]: https://github.com/gonzedge
[inch_ci_badge]: https://inch-ci.org/github/gonzedge/rambling-trie.svg?branch=master
[inch_ci_badge]: https://inch-ci.org/github/gonzedge/rambling-trie.svg?branch=main
[license_badge]: https://img.shields.io/badge/license-MIT-blue.svg
[license_link]: https://opensource.org/licenses/mit-license.php
[marshal]: https://ruby-doc.org/core-2.7.0/Marshal.html
[rambling_trie_configuration]: https://github.com/gonzedge/rambling-trie#configuration
[rambling_trie_contributing_guide]: https://github.com/gonzedge/rambling-trie/blob/master/CONTRIBUTING.md
[rambling_trie_plain_text_reader]: https://github.com/gonzedge/rambling-trie/blob/master/lib/rambling/trie/readers/plain_text.rb
[rambling_trie_contributing_guide]: https://github.com/gonzedge/rambling-trie/blob/main/CONTRIBUTING.md
[rambling_trie_plain_text_reader]: https://github.com/gonzedge/rambling-trie/blob/main/lib/rambling/trie/readers/plain_text.rb
[rbenv]: https://github.com/sstephenson/rbenv
[rubydoc]: http://rubydoc.info/gems/rambling-trie
[rubydoc_github]: http://rubydoc.info/github/gonzedge/rambling-trie
Expand Down
2 changes: 1 addition & 1 deletion rambling-trie.gemspec
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
gem.homepage = 'https://github.com/gonzedge/rambling-trie'
gem.date = Time.now.strftime '%Y-%m-%d'
gem.metadata = {
'changelog_uri' => 'https://github.com/gonzedge/rambling-trie/blob/master/CHANGELOG.md',
'changelog_uri' => 'https://github.com/gonzedge/rambling-trie/blob/main/CHANGELOG.md',
'documentation_uri' => 'https://www.rubydoc.info/gems/rambling-trie',
}

Expand Down

0 comments on commit 815a926

Please sign in to comment.