ruby-changes:42282
From: naruse <ko1@a...>
Date: Tue, 29 Mar 2016 14:19:01 +0900 (JST)
Subject: [ruby-changes:42282] naruse:r54356 (ruby_2_3): merge revision(s) 53517, 53519, 53521, 53522, 53523, 53526, 53527:
naruse 2016-03-29 14:18:56 +0900 (Tue, 29 Mar 2016) New Revision: 54356 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54356 Log: merge revision(s) 53517,53519,53521,53522,53523,53526,53527: drop osx and clang because they are often fails and slow * .travis.yml: removed osx code. follow up with r53517 * .travis.yml: removed commented-out code. Modified directories: branches/ruby_2_3/ Modified files: branches/ruby_2_3/.travis.yml branches/ruby_2_3/ChangeLog branches/ruby_2_3/common.mk branches/ruby_2_3/version.h Index: ruby_2_3/common.mk =================================================================== --- ruby_2_3/common.mk (revision 54355) +++ ruby_2_3/common.mk (revision 54356) @@ -166,7 +166,7 @@ SHOWFLAGS = showflags https://github.com/ruby/ruby/blob/trunk/ruby_2_3/common.mk#L166 all: $(SHOWFLAGS) main docs -main: $(SHOWFLAGS) $(ENCSTATIC:static=lib)encs exts +main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs @$(NULLCMD) .PHONY: showflags Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 54355) +++ ruby_2_3/version.h (revision 54356) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 14 +#define RUBY_PATCHLEVEL 15 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_3/.travis.yml =================================================================== --- ruby_2_3/.travis.yml (revision 54355) +++ ruby_2_3/.travis.yml (revision 54356) @@ -18,16 +18,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/.travis.yml#L18 # Language specification. language: c +sudo: false # Compilers. Several compilers are provided in Travis, so we try them all. # The value set here is visible via $CC environment variable. compiler: - gcc - - clang os: - linux - - osx # Dependencies. Some header files are missing in a Travis' worker VM, so we # have to install them. The "1.9.1" here is OK. It is the most adopted @@ -35,25 +34,16 @@ os: https://github.com/ruby/ruby/blob/trunk/ruby_2_3/.travis.yml#L34 # far since the 1.9.1 release. before_install: - "CONFIG_FLAG=" - - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq update; fi" - # Travis ships an outdated, broken version of libssl by default - - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq --only-upgrade install '^libssl.*'; fi" - - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq install $CC; fi" # upgrade if any - - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then JOBS='-j'; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then brew install autoconf gdbm openssl; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then CONFIG_FLAG=\"$CONFIG_FLAG --with-gdbm-dir=`brew --prefix gdbm`\"; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then CONFIG_FLAG=\"$CONFIG_FLAG --with-openssl-dir=`brew --prefix openssl`\"; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' && $CC = 'gcc' ]]; then CC='gcc-4.9'; fi" -install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi" + - "JOBS='-j 4'" # Script is where the test runs. Note we just do "make test", not other tests # like test-all, test-rubyspec. This is because they take too much time, # enough for Travis to shut down the VM as being stalled. before_script: - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then rm -f ~/Library/Logs/DiagnosticReports/ruby_*.crash; fi" - "uname -a" - "uname -r" - "rm -fr .ext autom4te.cache" + - "echo $TERM" - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files" - "autoconf" - "mkdir config_1st config_2nd" @@ -63,16 +53,12 @@ before_script: https://github.com/ruby/ruby/blob/trunk/ruby_2_3/.travis.yml#L53 - "cp -pr config.status .ext/include config_2nd" - "diff -ru config_1st config_2nd" - "make after-update BASERUBY=ruby" - - "make -s $JOBS encs" - - "make -s $JOBS exts" + - "make -s $JOBS" - "make update-rubyspec" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then echo 'exclude :test_deadlock_by_signal_at_forking, \"under investigation\"' >> test/excludes/TestProcess.rb; fi" script: - - "make test" - - "make test-all TESTOPTS='-q -j2'" - - "make test-rubyspec" -after_failure: - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then find ~/Library/Logs/DiagnosticReports -type f -name ruby_\\*.crash -ls -execdir cat {} \\; -delete; fi" + - "make test TESTOPTS=--color=never" + - "make test-all TESTOPTS='-q -j3 --color=never --job-status=normal'" + - "make test-rubyspec MSPECOPT=-fm" # Branch matrix. Not all branches are Travis-ready so we limit branches here. branches: @@ -90,7 +76,7 @@ notifications: https://github.com/ruby/ruby/blob/trunk/ruby_2_3/.travis.yml#L76 - "irc.freenode.org#ruby-core" - "irc.freenode.org#ruby-ja" on_success: change # [always|never|change] # default: always - on_failure: change # [always|never|change] # default: always + on_failure: always # [always|never|change] # default: always template: - "%{message} by @%{author}: See %{build_url}" Index: ruby_2_3/ChangeLog =================================================================== --- ruby_2_3/ChangeLog (revision 54355) +++ ruby_2_3/ChangeLog (revision 54356) @@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1 +Tue Mar 29 14:18:26 2016 SHIBATA Hiroshi <hsbt@r...> + + * .travis.yml: removed commented-out code. + +Tue Mar 29 14:18:26 2016 SHIBATA Hiroshi <hsbt@r...> + + * .travis.yml: removed osx code. follow up with r53517 + Tue Mar 29 14:12:22 2016 Nobuyoshi Nakada <nobu@r...> * ext/socket/option.c (sockopt_bool): relax boolean size to be one Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r53517,53519,53521-53523,53526-53527 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/