From b1102b3b971e89684dfb4f35e22eaa639a1120db Mon Sep 17 00:00:00 2001 From: Vern Burton Date: Sun, 12 Aug 2018 17:08:41 -0500 Subject: [PATCH 1/7] removing un-needed elements from travis Signed-off-by: Vern Burton --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc1c7b13..138e28aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,10 @@ rvm: - 2.3 - 2.4 - 2.5 + - ruby-head - jruby matrix: allow_failures: - rvm: jruby + - rvm: ruby-head fast_finish: true -before_install: - - gem install bundler - - bundle --version - - git --version From d2979b4333dcf73dafb14bc3e3acebe68f175289 Mon Sep 17 00:00:00 2001 From: Vern Burton Date: Sun, 12 Aug 2018 17:21:32 -0500 Subject: [PATCH 2/7] removing cext which is not supported in travis Signed-off-by: Vern Burton --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 138e28aa..d3ee543b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ rvm: - 2.5 - ruby-head - jruby + env: JRUBY_OPTS='' + matrix: allow_failures: - rvm: jruby From 7232d999a7bfee8775aa6f4e4bc4d056ce12bf87 Mon Sep 17 00:00:00 2001 From: Vern Burton Date: Sun, 12 Aug 2018 17:26:50 -0500 Subject: [PATCH 3/7] using double quotes Signed-off-by: Vern Burton --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3ee543b..af15a768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ rvm: - 2.5 - ruby-head - jruby - env: JRUBY_OPTS='' + env: JRUBY_OPTS="" matrix: allow_failures: From b0609ba90ad6512a4382057362ed408e6871666b Mon Sep 17 00:00:00 2001 From: Vern Burton Date: Sun, 12 Aug 2018 17:29:47 -0500 Subject: [PATCH 4/7] adding matrix form Signed-off-by: Vern Burton --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af15a768..b352597d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,13 @@ rvm: - 2.5 - ruby-head - jruby - env: JRUBY_OPTS="" matrix: allow_failures: - rvm: jruby - rvm: ruby-head fast_finish: true + +env: + jruby: + JRUBY_OPTS="--server -Dcext.enabled=true -Xcompile.invokedynamic=false" \ No newline at end of file From 61644ddae5cfd96a38f5e0bed0cd3acf414b6604 Mon Sep 17 00:00:00 2001 From: Vern Burton Date: Sun, 12 Aug 2018 17:32:28 -0500 Subject: [PATCH 5/7] using a different matrix Signed-off-by: Vern Burton --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b352597d..d38f9f13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,12 @@ rvm: - 2.4 - 2.5 - ruby-head - - jruby matrix: + include: + - rvm: jruby + env: JRUBY_OPTS="--server -Dcext.enabled=true -Xcompile.invokedynamic=false" allow_failures: - rvm: jruby - rvm: ruby-head - fast_finish: true - -env: - jruby: - JRUBY_OPTS="--server -Dcext.enabled=true -Xcompile.invokedynamic=false" \ No newline at end of file + fast_finish: true \ No newline at end of file From e8c511a94b19f5764b4cf41314458f52be0c63f5 Mon Sep 17 00:00:00 2001 From: Vern Burton Date: Sun, 12 Aug 2018 17:36:01 -0500 Subject: [PATCH 6/7] install bundler in jruby Signed-off-by: Vern Burton --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index d38f9f13..ab796f63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,15 @@ rvm: - 2.3 - 2.4 - 2.5 + - 2.6 - ruby-head matrix: include: - rvm: jruby env: JRUBY_OPTS="--server -Dcext.enabled=true -Xcompile.invokedynamic=false" + before_install: + - gem install bundler allow_failures: - rvm: jruby - rvm: ruby-head From 5df639506984d96f046b0100705bbdfbbbee6c4f Mon Sep 17 00:00:00 2001 From: Vern Burton Date: Sun, 12 Aug 2018 17:44:40 -0500 Subject: [PATCH 7/7] removing .jrubyrc as C extension support was deprecated in 1.7 and newer versions are missing much of the support (Source: https://github.com/jruby/jruby-cext). adding jruby back to the standard matrix Signed-off-by: Vern Burton --- .jrubyrc | 1 - .travis.yml | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 .jrubyrc diff --git a/.jrubyrc b/.jrubyrc deleted file mode 100644 index 250bfe2d..00000000 --- a/.jrubyrc +++ /dev/null @@ -1 +0,0 @@ -cext.enabled=true diff --git a/.travis.yml b/.travis.yml index ab796f63..4dd67901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,9 @@ rvm: - 2.5 - 2.6 - ruby-head + - jruby matrix: - include: - - rvm: jruby - env: JRUBY_OPTS="--server -Dcext.enabled=true -Xcompile.invokedynamic=false" - before_install: - - gem install bundler allow_failures: - rvm: jruby - rvm: ruby-head