From d22c6823095203604791e8c2422c379247484049 Mon Sep 17 00:00:00 2001 From: Edgar Gonzalez Date: Fri, 9 Feb 2024 15:24:35 -0500 Subject: [PATCH 1/3] Use main branch for .github/workflows --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/dependency-review.yml | 2 +- .github/workflows/ruby.yml | 4 ++-- .github/workflows/semgrep.yml | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index db3011f2..1a7a94ac 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,10 +14,10 @@ name: codeql on: push: branches: - - master + - main pull_request: branches: - - master + - main schedule: - cron: '45 10 * * 6' diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 666d2083..7fba61fc 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -8,7 +8,7 @@ name: dependency-review on: pull_request: branches: - - master + - main permissions: contents: read diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index a7a3bc0a..dafd73c8 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -3,10 +3,10 @@ name: build on: push: branches: - - master + - main pull_request: branches: - - master + - main permissions: contents: read diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 5b0c0c33..a94a8e13 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -5,7 +5,6 @@ on: push: branches: - main - - master paths: - .github/workflows/semgrep.yml schedule: From de110db3ffa837b17670c4f78bf4c8be2f58f878 Mon Sep 17 00:00:00 2001 From: Edgar Gonzalez Date: Sun, 18 Feb 2024 20:17:59 -0500 Subject: [PATCH 2/3] Change ma{ster,in} branch in README, CONTRIBUTING and CHANGELOG --- CHANGELOG.md | 4 ++-- CONTRIBUTING.md | 4 ++-- README.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef17a350..58d14ee6 100644 --- a/CHANGELOG.md +++ b/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] @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cd209722..99eb22dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 ``` diff --git a/README.md b/README.md index 70c1a9ce..4496f08e 100644 --- a/README.md +++ b/README.md @@ -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 From 617cdc7902871ebf999942b9e391ed51db057e9a Mon Sep 17 00:00:00 2001 From: Edgar Gonzalez Date: Sun, 18 Feb 2024 20:18:50 -0500 Subject: [PATCH 3/3] Change ma{ster,in} branch in changelog_uri in gemspec --- rambling-trie.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rambling-trie.gemspec b/rambling-trie.gemspec index 98f0a1e9..f48a3c52 100644 --- a/rambling-trie.gemspec +++ b/rambling-trie.gemspec @@ -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', }