feat: setup MSYS2 after Ruby installation

bazel-contrib · Nov 24, 2023 · 70c3e7f · 70c3e7f
1 parent 14a09bd
commit 70c3e7f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/examples/gem/Gemfile b/examples/gem/Gemfile
@@ -4,5 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'debug', '>= 1.0.0', platforms: %i[mri mswin64]
+gem 'psych', '~> 5.1' # Gem with native extensions.
 gem 'rspec', '~> 3.0'
 gem 'rubocop', '~> 1.10', '>= 1.55'
diff --git a/examples/gem/Gemfile.lock b/examples/gem/Gemfile.lock
@@ -19,13 +19,18 @@ GEM
     io-console (0.5.11)
     irb (1.5.0)
       reline (>= 0.3.0)
+    jar-dependencies (0.4.1)
     json (2.6.3)
     json (2.6.3-java)
     language_server-protocol (3.17.0.3)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
+    psych (5.1.1.1)
+      stringio
+    psych (5.1.1.1-java)
+      jar-dependencies (>= 0.1.7)
     racc (1.7.1)
     racc (1.7.1-java)
     rainbow (3.1.1)
@@ -61,6 +66,7 @@ GEM
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
+    stringio (3.0.9)
     unicode-display_width (2.4.2)
 
 PLATFORMS
@@ -75,6 +81,7 @@ PLATFORMS
 DEPENDENCIES
   debug (>= 1.0.0)
   example!
+  psych (~> 5.1)
   rspec (~> 3.0)
   rubocop (~> 1.10, >= 1.55)
 

diff --git a/ruby/private/download.bzl b/ruby/private/download.bzl
@@ -131,9 +131,13 @@ def _install_via_rubyinstaller(repository_ctx):
         "/tasks=nomodpath,noassocfiles",
         "/verysilent",
     ])
-
     repository_ctx.delete("ruby-installer.exe")
+    if result.return_code != 0:
+        fail("%s\n%s" % (result.stdout, result.stderr))
 
+    # https://github.com/oneclick/rubyinstaller2/issues/79
+    repository_ctx.report_progress("Setting up MSYS2")
+    result = repository_ctx.execute(["./dist/bin/ridk.cmd", "exec", "bash", "-lc", "true"])
     if result.return_code != 0:
         fail("%s\n%s" % (result.stdout, result.stderr))