summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2020-05-26 11:48:42 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2020-10-12 16:21:01 +0900
commit1122124f9774210650f66cae2b6f2baa67aff581 (patch)
tree9ed8ed9ec79129d6342cbd52f33da6930204871d
parent5405977a6e438678d649ff6cbf6d36926bb752ef (diff)
downloadmruby-1122124f9774210650f66cae2b6f2baa67aff581.tar.gz
mruby-1122124f9774210650f66cae2b6f2baa67aff581.zip
Revert part of "Start GitHub Actions" (4ce3997c)
Because some changes have been overridden.
-rw-r--r--lib/mruby/build.rb8
-rw-r--r--target/travis.rb18
2 files changed, 0 insertions, 26 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index 78465fee6..9ba136cf3 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/target/travis.rb b/target/travis.rb
index 6af9c98d2..f4bef0a52 100644
--- a/target/travis.rb
+++ b/target/travis.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)