diff options
| -rw-r--r-- | .travis.yml | 30 | ||||
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 18 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml index 2194af2629..f87ffd3483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,15 @@ # 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: # 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: - "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: - "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}" @@ -1,3 +1,11 @@ +Tue Mar 29 14:18:26 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * .travis.yml: removed commented-out code. + +Tue Mar 29 14:18:26 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * .travis.yml: removed osx code. follow up with r53517 + Tue Mar 29 14:12:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/socket/option.c (sockopt_bool): relax boolean size to be one @@ -166,7 +166,7 @@ SHOWFLAGS = showflags all: $(SHOWFLAGS) main docs -main: $(SHOWFLAGS) $(ENCSTATIC:static=lib)encs exts +main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs @$(NULLCMD) .PHONY: showflags @@ -1,6 +1,6 @@ #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 |