kotovalexarian-likes-github
/
sinatra
mirror of https://github.com/sinatra/sinatra
1
0
Fork 0
Code Releases Activity

Merge pull request #1815 from olleolleolle/patch-5 

CI: Refer to rack/rack default branch as 'main'
This commit is contained in:
Jordan Owens 2022-09-26 09:18:03 -04:00 committed by GitHub
parent 2619255612 dacd07d370
commit e521b6042b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
ruby: [2.6, 2.7, '3.0', 3.1, 'jruby-9.3', truffleruby, truffleruby-head]
include:
- { ruby: 3.1, rack: master, allow-failure: true }
- { ruby: 3.1, rack: main, allow-failure: true }
- { ruby: jruby-head, rack: stable, allow-failure: true }
env:
rack: ${{ matrix.rack }}

2
Gemfile
View File

@ -15,7 +15,7 @@ gem 'rake'
rack_version = ENV['rack'].to_s
rack_version = nil if rack_version.empty? || (rack_version == 'stable')
rack_version = { github: 'rack/rack' } if rack_version == 'master'
rack_version = { github: 'rack/rack' } if rack_version == 'main'
gem 'rack', rack_version
gem 'minitest', '~> 5.0'

2
rack-protection/Gemfile
View File

@ -7,7 +7,7 @@ gem 'rake'
rack_version = ENV['rack'].to_s
rack_version = nil if rack_version.empty? || (rack_version == 'stable')
rack_version = { github: 'rack/rack' } if rack_version == 'master'
rack_version = { github: 'rack/rack' } if rack_version == 'main'
gem 'rack', rack_version
gem 'sinatra', path: '..'