Unverified Commit 76241a96 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub

Merge pull request #5264 from...

Merge pull request #5264 from shuujii/immediately-flush-output-to-stdout-stderr-so-that-logs-are-not-mixed-on-CI

Immediately flush output to stdout/stderr so that logs are not mixed on CI
parents a435cc94 35c85cb2
...@@ -87,7 +87,7 @@ jobs: ...@@ -87,7 +87,7 @@ jobs:
- name: Build and test - name: Build and test
# If build and test are separated like `rake && rake test`, somehow # If build and test are separated like `rake && rake test`, somehow
# it will be fully built even at `rake test`, so it is not separated. # it will be fully built even at `rake test`, so it is not separated.
run: rake -E STDOUT.sync=true test run: rake test
Windows-Cygwin: Windows-Cygwin:
needs: Check-Skip needs: Check-Skip
...@@ -130,9 +130,7 @@ jobs: ...@@ -130,9 +130,7 @@ jobs:
run: ${{ env.CC }} --version run: ${{ env.CC }} --version
- name: Build and test - name: Build and test
shell: cmd shell: cmd
run: | run: ruby /usr/bin/rake -m && ruby /usr/bin/rake test
ruby /usr/bin/rake -E STDOUT.sync=true -m
ruby /usr/bin/rake -E STDOUT.sync=true test
- name: Set PATH for cache archiving (tar) - name: Set PATH for cache archiving (tar)
# set Windows path so that Cygwin tar is not used for cache archiving # set Windows path so that Cygwin tar is not used for cache archiving
run: echo '::set-env name=PATH::C:\windows\System32' run: echo '::set-env name=PATH::C:\windows\System32'
...@@ -150,4 +148,4 @@ jobs: ...@@ -150,4 +148,4 @@ jobs:
shell: cmd shell: cmd
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
rake -E STDOUT.sync=true -m && rake -E STDOUT.sync=true test rake -m && rake test
...@@ -3,12 +3,9 @@ language: c ...@@ -3,12 +3,9 @@ language: c
jobs: jobs:
- os: linux - os: linux
- os: osx - os: osx
before_install:
- HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 brew install bison
- export PATH="/usr/local/opt/bison/bin:$PATH"
env: env:
- MRUBY_CONFIG=ci/gcc-clang - MRUBY_CONFIG=ci/gcc-clang
script: script:
- rake gensym && rake -m && rake test - rake -m && rake test
...@@ -41,6 +41,5 @@ init: ...@@ -41,6 +41,5 @@ init:
build_script: build_script:
- set MRUBY_CONFIG=ci/msvc - set MRUBY_CONFIG=ci/msvc
- rake gensym - rake -m
- rake -m all - rake test
- rake -E $stdout.sync=true test
STDOUT.sync = STDERR.sync = true
MRuby::Build.new('full-debug') do |conf| MRuby::Build.new('full-debug') do |conf|
conf.toolchain conf.toolchain
conf.enable_debug conf.enable_debug
......
STDOUT.sync = STDERR.sync = true
def setup_option(conf) def setup_option(conf)
conf.cc.compile_options.sub!(%r{/Zi }, "") unless ENV['CFLAGS'] conf.cc.compile_options.sub!(%r{/Zi }, "") unless ENV['CFLAGS']
conf.cxx.compile_options.sub!(%r{/Zi }, "") unless ENV['CFLAGS'] || ENV['CXXFLAGS'] conf.cxx.compile_options.sub!(%r{/Zi }, "") unless ENV['CFLAGS'] || ENV['CXXFLAGS']
...@@ -5,7 +7,7 @@ def setup_option(conf) ...@@ -5,7 +7,7 @@ def setup_option(conf)
end end
MRuby::Build.new do |conf| MRuby::Build.new do |conf|
toolchain :visualcpp conf.toolchain :visualcpp
# include all core GEMs # include all core GEMs
conf.gembox 'full-core' conf.gembox 'full-core'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment