diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-05-26 12:43:38 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-05-26 12:43:38 +0900 |
| commit | ab9be1b48a847c4b6e5986513176cc0eb48f0fe4 (patch) | |
| tree | b8ca69da3e4c3c4357e53c6150654c609de597e3 | |
| parent | 6445e4683f7539438481bbf43d2ef62d115f0de2 (diff) | |
| parent | 53ea8abea674f096517ac4499424fafce379eb09 (diff) | |
| download | mruby-ab9be1b48a847c4b6e5986513176cc0eb48f0fe4.tar.gz mruby-ab9be1b48a847c4b6e5986513176cc0eb48f0fe4.zip | |
Merge pull request #5008 from shuujii/revert-part-of-Start-GitHub-Actions
Revert part of "Start GitHub Actions" (4ce3997c)
| -rw-r--r-- | lib/mruby/build.rb | 8 | ||||
| -rw-r--r-- | travis_config.rb | 18 |
2 files changed, 0 insertions, 26 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 763334cf5..8154b2b19 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -276,14 +276,6 @@ EOS end end - def cygwin_filename(name) - if name.is_a?(Array) - name.flatten.map { |n| cygwin_filename(n) } - else - `cygpath -w "#{filename(name)}"`.strip - end - end - def exefile(name) if name.is_a?(Array) name.flatten.map { |n| exefile(n) } diff --git a/travis_config.rb b/travis_config.rb index 6af9c98d2..f4bef0a52 100644 --- a/travis_config.rb +++ b/travis_config.rb @@ -1,21 +1,5 @@ -MRuby::Build.new('debug') do |conf| - toolchain :gcc - yacc.command = ENV['YACC'] || 'bison' - enable_debug - - # include all core GEMs - conf.gembox 'full-core' - conf.cc.flags += %w(-Werror=declaration-after-statement) - conf.compilers.each do |c| - c.defines += %w(MRB_GC_STRESS MRB_GC_FIXED_ARENA MRB_METHOD_CACHE) - end - - build_mrbc_exec -end - MRuby::Build.new('full-debug') do |conf| toolchain :gcc - yacc.command = ENV['YACC'] || 'bison' enable_debug # include all core GEMs @@ -28,7 +12,6 @@ end MRuby::Build.new do |conf| toolchain :gcc - yacc.command = ENV['YACC'] || 'bison' # include all core GEMs conf.gembox 'full-core' @@ -42,7 +25,6 @@ end MRuby::Build.new('cxx_abi') do |conf| toolchain :gcc - yacc.command = ENV['YACC'] || 'bison' conf.gembox 'full-core' conf.cc.flags += %w(-fpermissive) |