master => main

This commit is contained in:
Peter Solnica 2022-04-03 11:48:10 +02:00
parent 3043ad804a
commit 7e00ed573a
No known key found for this signature in database
GPG Key ID: 4B177344822BD3BB
6 changed files with 25 additions and 25 deletions

View File

@ -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}" %>

View File

@ -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}}"

View File

@ -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}}

View File

@ -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"

View File

@ -1,6 +1,6 @@
<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
## 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

12
Gemfile
View File

@ -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