Skip to content

Commit

Permalink
Merge pull request #125 from railsinstaller/ruby3.2.2
Browse files Browse the repository at this point in the history
Upgrade version
  • Loading branch information
robertmabbs authored Nov 18, 2023
2 parents 7da61d9 + 6a70d68 commit f99f083
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions config/railsinstaller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
:list:
-
:name: rails
:version: "7.0.4"
:version: "7.1.2"

:ruby313:
:ruby322:
:category: component
:title: Ruby 3.1.3
:name: Ruby313
:title: Ruby 3.2.2
:name: Ruby322
:regex: '^.*$'
:url: "https://github.com/robertmabbs/railsinstaller-rubydevkit/releases/download/rubyinstaller-devkit-3.1.3-1-x64/rubyinstaller-devkit-3.1.3-1-x64.7z"
:rename: Ruby3.1.3
:url: "https://github.com/robertmabbs/railsinstaller-rubydevkit/releases/download/rubyinstaller-devkit-3.2.2-1-x64/rubyinstaller-devkit-3.2.2-1-x64.7z"
:rename: Ruby3.2.2

:bsdtar:
:name: BSDTar
Expand Down
4 changes: 2 additions & 2 deletions lib/railsinstaller/actions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module RailsInstaller
def self.build!

components = [
BSDTar, SevenZip, Git, Ruby313
BSDTar, SevenZip, Git, Ruby322
]

components.each do |package|
Expand Down Expand Up @@ -64,7 +64,7 @@ def self.package!
iscc " \"#{File.join(RailsInstaller::Root, "resources", "railsinstaller", "railsinstaller.iss")}\"",
"/DInstallerVersion=\"#{railsinstaller_version}\"",
"/DStagePath=\"#{RailsInstaller::Stage}\"",
"/DRubyPath=\"#{RailsInstaller::Ruby313.rename}\"",
"/DRubyPath=\"#{RailsInstaller::Ruby322.rename}\"",
"/DResourcesPath=\"#{File.join(RailsInstaller::Root, "resources")}\"",
"/O\"#{RailsInstaller::PackageDir}\"",
"/Frailsinstaller-#{railsinstaller_version}"
Expand Down
4 changes: 2 additions & 2 deletions lib/railsinstaller/methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,15 @@ def self.stage_git
end

def self.stage_gem_update
ruby_path = File.join(Stage, Ruby313.rename)
ruby_path = File.join(Stage, Ruby322.rename)

line = %Q(#{File.join(ruby_path, "bin", "gem")} update )
sh line
end

def self.stage_gems
section Gems
build_gems(File.join(Stage, Ruby313.rename), Gems.list)
build_gems(File.join(Stage, Ruby322.rename), Gems.list)
end

def self.fix_batch_files
Expand Down

0 comments on commit f99f083

Please sign in to comment.