Merge pull request #545 from MSP-Greg/00-ci-mswin

[CI] Add Windows mswin job
ruby · Nov 7, 2023 · aa2c032 · aa2c032
2 parents 94d9c89 + 169bfe9
commit aa2c032
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,7 @@ jobs:
         - windows-latest
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         include:
+        - { os: windows-latest , ruby: mswin     } # ruby/ruby windows CI
         - { os: ubuntu-latest  , ruby: jruby-9.1 } # Ruby 2.3
         - { os: ubuntu-latest  , ruby: jruby-9.2 } # Ruby 2.5
         - { os: ubuntu-latest  , ruby: jruby-9.3 } # Ruby 2.7

diff --git a/Rakefile b/Rakefile
@@ -45,8 +45,14 @@ JAVA_CLASSES        = []
 JRUBY_PARSER_JAR    = File.expand_path("lib/json/ext/parser.jar")
 JRUBY_GENERATOR_JAR = File.expand_path("lib/json/ext/generator.jar")
 
-RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd ragel].find(&which)
-RAGEL_DOTGEN      = %w[rlgen-dot rlgen-cd ragel].find(&which)
+if RUBY_PLATFORM =~ /mingw|mswin/
+  # cleans up Windows CI output
+  RAGEL_CODEGEN     = %w[ragel].find(&which)
+  RAGEL_DOTGEN      = %w[ragel].find(&which)
+else
+  RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd ragel].find(&which)
+  RAGEL_DOTGEN      = %w[rlgen-dot rlgen-cd ragel].find(&which)
+end
 
 desc "Installing library (pure)"
 task :install_pure => :version do