Skip to content

Commit 4aa1625

Browse files
committed
Always install sdoc from git
The EDGE environment variable isn't set when installing the gems. Since this branch is the edge branch, we don't need this environment variable.
1 parent 743d1fc commit 4aa1625

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

Gemfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ group :mdl do
5959
end
6060

6161
group :doc do
62-
if ENV["EDGE"]
63-
gem "sdoc", git: "https://github.com/rails/sdoc.git", branch: "main"
64-
else
65-
gem "sdoc", ">= 2.6.0"
66-
end
62+
gem "sdoc", git: "https://github.com/rails/sdoc.git", branch: "main"
6763
gem "rdoc", "~> 6.5"
6864
gem "redcarpet", "~> 3.2.3", platforms: :ruby
6965
gem "w3c_validators", "~> 1.3.6"

Gemfile.lock

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ GIT
1515
event_emitter
1616
websocket
1717

18+
GIT
19+
remote: https://github.com/rails/sdoc.git
20+
revision: 947abf9d928f37b9cb91c8139e051b834265724a
21+
branch: main
22+
specs:
23+
sdoc (3.0.0.alpha)
24+
nokogiri
25+
rdoc (>= 5.0)
26+
rouge
27+
1828
PATH
1929
remote: .
2030
specs:
@@ -465,8 +475,6 @@ GEM
465475
rubyzip (2.3.2)
466476
rufus-scheduler (3.8.2)
467477
fugit (~> 1.1, >= 1.1.6)
468-
sdoc (2.6.1)
469-
rdoc (>= 5.0)
470478
selenium-webdriver (4.11.0)
471479
rexml (~> 3.2, >= 3.2.5)
472480
rubyzip (>= 1.2.2, < 3.0)
@@ -621,7 +629,7 @@ DEPENDENCIES
621629
rubocop-performance
622630
rubocop-rails
623631
rubyzip (~> 2.0)
624-
sdoc (>= 2.6.0)
632+
sdoc!
625633
selenium-webdriver (>= 4.11.0)
626634
sidekiq
627635
sneakers

0 commit comments

Comments
 (0)