From 7e00ed573a4840e57e39197be4a03d5c20833a58 Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Sun, 3 Apr 2022 11:48:10 +0200 Subject: [PATCH] master => main --- .devtools/templates/changelog.erb | 2 +- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/custom/ci.yml | 12 ++++++------ .github/workflows/rubocop.yml | 4 ++-- CHANGELOG.md | 4 ++-- Gemfile | 12 ++++++------ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.devtools/templates/changelog.erb b/.devtools/templates/changelog.erb index 6ed7fdf..941112e 100644 --- a/.devtools/templates/changelog.erb +++ b/.devtools/templates/changelog.erb @@ -32,7 +32,7 @@ - <%= log %> <% end %> <% end %> -<% curr_ver = r.date ? "v#{r.version}" : 'master' %> +<% curr_ver = r.date ? "v#{r.version}" : 'main' %> <% prev_rel = releases[idx + 1] %> <% if prev_rel %> <% ver_range = "v#{prev_rel.version}...#{curr_ver}" %> diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05bf0bf..4f8c61a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ name: ci - project.yml pull_request: branches: - - master + - main create: jobs: tests: @@ -30,15 +30,15 @@ jobs: - ruby: '3.1' coverage: 'true' - ruby: 2.7.0 - dry_schema_from_master: 'true' - dry_types_from_master: 'true' - dry_configurable_from_master: 'true' + dry_schema_from_main: 'true' + dry_types_from_main: 'true' + dry_configurable_from_main: 'true' env: COVERAGE: "${{matrix.coverage}}" COVERAGE_TOKEN: "${{secrets.CODACY_PROJECT_TOKEN}}" - DRY_SCHEMA_FROM_MASTER: "${{matrix.dry_schema_from_master}}" - DRY_TYPES_FROM_MASTER: "${{matrix.dry_types_from_master}}" - DRY_CONFIGURABLE_FROM_MASTER: "${{matrix.dry_configurable_from_master}}" + DRY_SCHEMA_FROM_MAIN: "${{matrix.dry_schema_from_main}}" + DRY_TYPES_FROM_MAIN: "${{matrix.dry_types_from_main}}" + DRY_CONFIGURABLE_FROM_MAIN: "${{matrix.dry_configurable_from_main}}" steps: - name: Checkout uses: actions/checkout@v2 @@ -57,7 +57,7 @@ jobs: - name: Run all tests run: bundle exec rake - name: Run codacy-coverage-reporter - uses: codacy/codacy-coverage-reporter-action@master + uses: codacy/codacy-coverage-reporter-action@main if: env.COVERAGE == 'true' && env.COVERAGE_TOKEN != '' with: project-token: "${{secrets.CODACY_PROJECT_TOKEN}}" diff --git a/.github/workflows/custom/ci.yml b/.github/workflows/custom/ci.yml index e0949d8..0324292 100644 --- a/.github/workflows/custom/ci.yml +++ b/.github/workflows/custom/ci.yml @@ -4,10 +4,10 @@ jobs: matrix: include: - ruby: "2.7.0" - dry_schema_from_master: "true" - dry_types_from_master: "true" - dry_configurable_from_master: "true" + dry_schema_from_main: "true" + dry_types_from_main: "true" + dry_configurable_from_main: "true" env: - DRY_SCHEMA_FROM_MASTER: ${{matrix.dry_schema_from_master}} - DRY_TYPES_FROM_MASTER: ${{matrix.dry_types_from_master}} - DRY_CONFIGURABLE_FROM_MASTER: ${{matrix.dry_configurable_from_master}} + DRY_SCHEMA_FROM_MAIN: ${{matrix.dry_schema_from_main}} + DRY_TYPES_FROM_MAIN: ${{matrix.dry_types_from_main}} + DRY_CONFIGURABLE_FROM_MAIN: ${{matrix.dry_configurable_from_main}} diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 46394e8..36e88cf 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -3,7 +3,7 @@ on: push: branches: - "main" - - "master" + - "main" paths: - "**/*.rb" - "**/*.rake" @@ -13,7 +13,7 @@ on: pull_request: branches: - "main" - - "master" + - "main" types: - "opened" - "synchronize" diff --git a/CHANGELOG.md b/CHANGELOG.md index 731f67e..9fe8388 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ -## unreleased +## unreleased ### Fixed @@ -8,7 +8,7 @@ - Raise an InvalidKeyErrors on substring of valid keys (issue #705 fixed via #706) (@MatElGran) -[Compare v1.8.0...master](https://github.com/dry-rb/dry-validation/compare/v1.8.0...master) +[Compare v1.8.0...main](https://github.com/dry-rb/dry-validation/compare/v1.8.0...main) ## 1.8.0 2022-02-17 diff --git a/Gemfile b/Gemfile index 63e0f2b..bdd17c8 100644 --- a/Gemfile +++ b/Gemfile @@ -6,16 +6,16 @@ eval_gemfile "Gemfile.devtools" gemspec -if ENV["DRY_CONFIGURABLE_FROM_MASTER"].eql?("true") - gem "dry-configurable", github: "dry-rb/dry-configurable", branch: "master" +if ENV["DRY_CONFIGURABLE_FROM_MAIN"].eql?("true") + gem "dry-configurable", github: "dry-rb/dry-configurable", branch: "main" end -if ENV["DRY_SCHEMA_FROM_MASTER"].eql?("true") - gem "dry-schema", github: "dry-rb/dry-schema", branch: "master" +if ENV["DRY_SCHEMA_FROM_MAIN"].eql?("true") + gem "dry-schema", github: "dry-rb/dry-schema", branch: "main" end -if ENV["DRY_TYPES_FROM_MASTER"].eql?("true") - gem "dry-types", github: "dry-rb/dry-types", branch: "master" +if ENV["DRY_TYPES_FROM_MAIN"].eql?("true") + gem "dry-types", github: "dry-rb/dry-types", branch: "main" end group :test do