Skip to content

Commit 4386901

Browse files
committed
Fix Rails integration branch name
I'm not aware of the magic how `bundle install` worked when we pointed to `rails`' `master` branch. `git fetch origin master` in Rails source fails.
1 parent d3e7b85 commit 4386901

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
include:
19-
# Rails Master (7.0) builds >= 2.7
19+
# Edge Rails (7.0) builds >= 2.7
2020
- ruby: 3.0
2121
allow_failure: true
2222
env:
23-
RAILS_VERSION: 'master'
23+
RAILS_VERSION: 'main'
2424
- ruby: 2.7
2525
allow_failure: true
2626
env:
27-
RAILS_VERSION: 'master'
27+
RAILS_VERSION: 'main'
2828

2929
# Rails 6.1 builds >= 2.5
3030
- ruby: 3.0

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ matrix:
4141
# Rails 6.1 builds >= 2.5
4242
- jdk: oraclejdk11
4343
env:
44-
- RAILS_VERSION='master'
44+
- RAILS_VERSION='main'
4545
- JRUBY_OPT=--dev
4646
- JAVA_OPTS="--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED"
4747

@@ -64,6 +64,6 @@ matrix:
6464

6565
branches:
6666
only:
67-
- master
67+
- main
6868
- /^\d+-\d+-maintenance$/
6969
- /^\d+-\d+-dev$/

Gemfile-rails-dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version_file = File.expand_path("../.rails-version", __FILE__)
22

33
case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
4-
when /master/
4+
when /main/
55
gem "rails", :git => "https://github.com/rails/rails.git"
66
gem 'puma', "3.12.1"
77
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]

Gemfile-sqlite-dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MAJOR =
55
case RAILS_VERSION
66
when /5-2-stable/
77
5
8-
when /master/, /stable/, nil, false, ''
8+
when /main/, /stable/, nil, false, ''
99
6
1010
else
1111
/(\d+)[\.|-]\d+/.match(RAILS_VERSION).captures.first.to_i

features/support/rails_versions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
def rails_version
22
string_version = ENV.fetch("RAILS_VERSION", "~> 6.0.0")
3-
if string_version == "master" || string_version.nil?
3+
if string_version == "main" || string_version.nil?
44
Float::INFINITY
55
else
66
string_version[/\d[\.-]\d/].tr('-', '.')

0 commit comments

Comments
 (0)