diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..286342c1cc --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +# no installation... +before_script: autoconf +script: "./configure && make all test" + +branches: + only: + - trunk + - ruby_1_9_3 diff --git a/ChangeLog b/ChangeLog index 4c30ee8113..1a0faf7714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Mar 2 22:09:03 2012 Hiroshi Nakamura + + * .travis.yml: Backport TravisCI configuration from trunk. + Thu Mar 1 18:39:44 2012 Nobuyoshi Nakada * file.c (rb_file_join): honor input encodings than ASCII-8BIT. diff --git a/version.h b/version.h index 8341716000..e7b420bcec 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 154 +#define RUBY_PATCHLEVEL 155 -#define RUBY_RELEASE_DATE "2012-03-01" +#define RUBY_RELEASE_DATE "2012-03-02" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h"