diff options
| -rw-r--r-- | .travis.yml | 41 | ||||
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 41 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index ccd4d3884c..0052fdfc41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,66 +18,57 @@ # 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 # version string for Debian/Ubuntu, and no dependencies have been changed so # far since the 1.9.1 release. before_install: - - "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 openssl; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then OPENSSL_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" + - "CONFIG_FLAG=" + - "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" - - "make -f common.mk BASERUBY=ruby srcdir=. update-config_files" + - "echo $TERM" + - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files" - "autoconf" - "mkdir config_1st config_2nd" - - "./configure -C --disable-install-doc --disable-install-rdoc --with-gcc=$CC $OPENSSL_FLAG" + - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG" - "cp -pr config.status .ext/include config_1st" - "make reconfig" - "cp -pr config.status .ext/include config_2nd" - - "diff -ru config_1st config_2nd || true" - - "make -s $JOBS encs" - - "make -s $JOBS exts" + - "diff -ru config_1st config_2nd" + - "make after-update BASERUBY=ruby" + - "make -s $JOBS" - "make update-rubyspec" script: - - "make test" - - "make test-all TESTS='-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: only: - trunk - - ruby_1_9_3 - - ruby_2_0_0 - ruby_2_1 - ruby_2_2 + - ruby_2_3 + - /^feature\// + - /^bug\// # We want to be notified when something happens. notifications: @@ -86,7 +77,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,26 @@ +Wed Mar 30 06:04:18 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * .travis.yml: removed commented-out code. + +Wed Mar 30 06:04:18 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * .travis.yml: removed osx code. follow up with r53517 + +Wed Mar 30 06:04:18 2016 Aaron Patterson <tenderlove@ruby-lang.org> + + * .travis.yml: update libssl before running tests. + Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the + travis settings! + +Wed Mar 30 06:04:18 2016 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * .travis.yml: removed Ruby 1.9.3 build on Travis CI + +Wed Mar 30 06:04:18 2016 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * .travis.yml: Remove redundant configuration option. + [fix GH-809] Patch by @gxworld + Wed Mar 30 05:15:04 2016 Kazuki Yamaguchi <k@rhe.jp> * ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb @@ -152,7 +152,7 @@ COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmp 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.2.5" #define RUBY_RELEASE_DATE "2016-03-30" -#define RUBY_PATCHLEVEL 287 +#define RUBY_PATCHLEVEL 288 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |