-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump jruby to 9.2.6.0 #5444
Merged
Merged
Bump jruby to 9.2.6.0 #5444
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cpuguy83
approved these changes
Feb 14, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for putting this together. This LGTM.
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index b5d315d..cf5dc73 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -18,29 +18,29 @@ jruby:9.1.17.0-jre-alpine @ amd64
jruby:9.1.17.0-jre-alpine @ arm64v8
jruby:9.1.17.0-jre-alpine @ ppc64le
jruby:9.1.17.0-jre-alpine @ s390x
-jruby:9.2.5.0-jdk @ amd64
-jruby:9.2.5.0-jdk @ arm32v5
-jruby:9.2.5.0-jdk @ arm64v8
-jruby:9.2.5.0-jdk @ i386
-jruby:9.2.5.0-jdk @ ppc64le
-jruby:9.2.5.0-jdk @ s390x
-jruby:9.2.5.0-jdk-alpine @ amd64
-jruby:9.2.5.0-jdk-alpine @ arm64v8
-jruby:9.2.5.0-jdk-alpine @ ppc64le
-jruby:9.2.5.0-jdk-alpine @ s390x
-jruby:9.2.5.0-jre @ amd64
-jruby:9.2.5.0-jre @ arm32v5
-jruby:9.2.5.0-jre @ arm64v8
-jruby:9.2.5.0-jre @ i386
-jruby:9.2.5.0-jre @ ppc64le
-jruby:9.2.5.0-jre @ s390x
-jruby:9.2.5.0-jre-alpine @ amd64
-jruby:9.2.5.0-jre-alpine @ arm64v8
-jruby:9.2.5.0-jre-alpine @ ppc64le
-jruby:9.2.5.0-jre-alpine @ s390x
-jruby:9.2.5.0-onbuild @ amd64
-jruby:9.2.5.0-onbuild @ arm32v5
-jruby:9.2.5.0-onbuild @ arm64v8
-jruby:9.2.5.0-onbuild @ i386
-jruby:9.2.5.0-onbuild @ ppc64le
-jruby:9.2.5.0-onbuild @ s390x
+jruby:9.2.6.0-jdk @ amd64
+jruby:9.2.6.0-jdk @ arm32v5
+jruby:9.2.6.0-jdk @ arm64v8
+jruby:9.2.6.0-jdk @ i386
+jruby:9.2.6.0-jdk @ ppc64le
+jruby:9.2.6.0-jdk @ s390x
+jruby:9.2.6.0-jdk-alpine @ amd64
+jruby:9.2.6.0-jdk-alpine @ arm64v8
+jruby:9.2.6.0-jdk-alpine @ ppc64le
+jruby:9.2.6.0-jdk-alpine @ s390x
+jruby:9.2.6.0-jre @ amd64
+jruby:9.2.6.0-jre @ arm32v5
+jruby:9.2.6.0-jre @ arm64v8
+jruby:9.2.6.0-jre @ i386
+jruby:9.2.6.0-jre @ ppc64le
+jruby:9.2.6.0-jre @ s390x
+jruby:9.2.6.0-jre-alpine @ amd64
+jruby:9.2.6.0-jre-alpine @ arm64v8
+jruby:9.2.6.0-jre-alpine @ ppc64le
+jruby:9.2.6.0-jre-alpine @ s390x
+jruby:9.2.6.0-onbuild @ amd64
+jruby:9.2.6.0-onbuild @ arm32v5
+jruby:9.2.6.0-onbuild @ arm64v8
+jruby:9.2.6.0-onbuild @ i386
+jruby:9.2.6.0-onbuild @ ppc64le
+jruby:9.2.6.0-onbuild @ s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 3158dff..cf03afa 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -29,17 +29,17 @@ jruby:9.2-jre
jruby:9.2-jre-alpine
jruby:9.2-onbuild
jruby:9.2.5
-jruby:9.2.5-alpine
-jruby:9.2.5-jdk
-jruby:9.2.5-jdk-alpine
-jruby:9.2.5-jre
-jruby:9.2.5-jre-alpine
-jruby:9.2.5-onbuild
-jruby:9.2.5.0
-jruby:9.2.5.0-alpine
-jruby:9.2.5.0-jdk
-jruby:9.2.5.0-jdk-alpine
-jruby:9.2.5.0-jre
-jruby:9.2.5.0-jre-alpine
-jruby:9.2.5.0-onbuild
+jruby:9.2.6-alpine
+jruby:9.2.6-jdk
+jruby:9.2.6-jdk-alpine
+jruby:9.2.6-jre
+jruby:9.2.6-jre-alpine
+jruby:9.2.6-onbuild
+jruby:9.2.6.0
+jruby:9.2.6.0-alpine
+jruby:9.2.6.0-jdk
+jruby:9.2.6.0-jdk-alpine
+jruby:9.2.6.0-jre
+jruby:9.2.6.0-jre-alpine
+jruby:9.2.6.0-onbuild
jruby:latest
diff --git a/jruby_9.2.5.0-jdk-alpine/Dockerfile b/jruby_9.2.6.0-jdk-alpine/Dockerfile
similarity index 92%
rename from jruby_9.2.5.0-jdk-alpine/Dockerfile
rename to jruby_9.2.6.0-jdk-alpine/Dockerfile
index b9179ca..db93306 100644
--- a/jruby_9.2.5.0-jdk-alpine/Dockerfile
+++ b/jruby_9.2.6.0-jdk-alpine/Dockerfile
@@ -4,8 +4,8 @@ RUN apk add --no-cache \
bash \
libc6-compat
-ENV JRUBY_VERSION 9.2.5.0
-ENV JRUBY_SHA256 f4ad088082eca73561df983f6cb0a937b966cba3a36454e88f63930ed2bdf349
+ENV JRUBY_VERSION 9.2.6.0
+ENV JRUBY_SHA256 70a1ff0e17a98baa63ea92c91fd38ff1e55a2056e5d57ba0409c4543d29e0e3d
RUN apk add --no-cache --virtual .build-deps \
curl \
diff --git a/jruby_9.2.5.0-jdk/Dockerfile b/jruby_9.2.6.0-jdk/Dockerfile
similarity index 91%
rename from jruby_9.2.5.0-jdk/Dockerfile
rename to jruby_9.2.6.0-jdk/Dockerfile
index cd2255f..f439257 100644
--- a/jruby_9.2.5.0-jdk/Dockerfile
+++ b/jruby_9.2.6.0-jdk/Dockerfile
@@ -2,8 +2,8 @@ FROM openjdk:8-jdk
RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-ENV JRUBY_VERSION 9.2.5.0
-ENV JRUBY_SHA256 f4ad088082eca73561df983f6cb0a937b966cba3a36454e88f63930ed2bdf349
+ENV JRUBY_VERSION 9.2.6.0
+ENV JRUBY_SHA256 70a1ff0e17a98baa63ea92c91fd38ff1e55a2056e5d57ba0409c4543d29e0e3d
RUN mkdir /opt/jruby \
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
diff --git a/jruby_9.2.5.0-jre-alpine/Dockerfile b/jruby_9.2.6.0-jre-alpine/Dockerfile
similarity index 92%
rename from jruby_9.2.5.0-jre-alpine/Dockerfile
rename to jruby_9.2.6.0-jre-alpine/Dockerfile
index 6010b25..4997c72 100644
--- a/jruby_9.2.5.0-jre-alpine/Dockerfile
+++ b/jruby_9.2.6.0-jre-alpine/Dockerfile
@@ -4,8 +4,8 @@ RUN apk add --no-cache \
bash \
libc6-compat
-ENV JRUBY_VERSION 9.2.5.0
-ENV JRUBY_SHA256 f4ad088082eca73561df983f6cb0a937b966cba3a36454e88f63930ed2bdf349
+ENV JRUBY_VERSION 9.2.6.0
+ENV JRUBY_SHA256 70a1ff0e17a98baa63ea92c91fd38ff1e55a2056e5d57ba0409c4543d29e0e3d
RUN apk add --no-cache --virtual .build-deps \
curl \
diff --git a/jruby_9.2.5.0-jre/Dockerfile b/jruby_9.2.6.0-jre/Dockerfile
similarity index 91%
rename from jruby_9.2.5.0-jre/Dockerfile
rename to jruby_9.2.6.0-jre/Dockerfile
index a714797..891f13e 100644
--- a/jruby_9.2.5.0-jre/Dockerfile
+++ b/jruby_9.2.6.0-jre/Dockerfile
@@ -2,8 +2,8 @@ FROM openjdk:8-jre
RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-ENV JRUBY_VERSION 9.2.5.0
-ENV JRUBY_SHA256 f4ad088082eca73561df983f6cb0a937b966cba3a36454e88f63930ed2bdf349
+ENV JRUBY_VERSION 9.2.6.0
+ENV JRUBY_SHA256 70a1ff0e17a98baa63ea92c91fd38ff1e55a2056e5d57ba0409c4543d29e0e3d
RUN mkdir /opt/jruby \
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
diff --git a/jruby_9.2.5.0-onbuild/Dockerfile b/jruby_9.2.6.0-onbuild/Dockerfile
similarity index 100%
rename from jruby_9.2.5.0-onbuild/Dockerfile
rename to jruby_9.2.6.0-onbuild/Dockerfile |
Build test of #5444; 799fb3a; $ bashbrew build jruby:latest
Building bashbrew/cache:b51b05885e55e47c0580a90694b2b39c14169e0a30568b269f485e5bcf0adebe (jruby:latest)
Tagging jruby:latest
Tagging jruby:9
Tagging jruby:9.2
Tagging jruby:9.2.5
Tagging jruby:9.2-jre
Tagging jruby:9.2.6-jre
Tagging jruby:9.2.6.0
Tagging jruby:9.2.6.0-jre
$ test/run.sh jruby:latest
testing jruby:latest
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...passed
'override-cmd' [4/9]...passed
'ruby-hello-world' [5/9]...passed
'ruby-standard-libs' [6/9]...passed
'ruby-gems' [7/9]...passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9-alpine
Building bashbrew/cache:923743a5c8eaf371ef8807d44cdf1158440ab0d5836e4938a669bcb99e1bde3b (jruby:9-alpine)
Tagging jruby:9-alpine
Tagging jruby:9.2-alpine
Tagging jruby:9.2.6-alpine
Tagging jruby:9.2-jre-alpine
Tagging jruby:9.2.6-jre-alpine
Tagging jruby:9.2.6.0-alpine
Tagging jruby:9.2.6.0-jre-alpine
$ test/run.sh jruby:9-alpine
testing jruby:9-alpine
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'ruby-hello-world' [5/7]...passed
'ruby-standard-libs' [6/7]...passed
'ruby-nonroot' [7/7]...passed
$ bashbrew build jruby:9-jdk
Building bashbrew/cache:e8d56c36810d5c24b1e0eb4806e270b124e28412e4739050adf551e0f73129e8 (jruby:9-jdk)
Tagging jruby:9-jdk
Tagging jruby:9.2-jdk
Tagging jruby:9.2.6-jdk
Tagging jruby:9.2.6.0-jdk
$ test/run.sh jruby:9-jdk
testing jruby:9-jdk
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...passed
'override-cmd' [4/9]...passed
'ruby-hello-world' [5/9]...passed
'ruby-standard-libs' [6/9]...passed
'ruby-gems' [7/9]...passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9-jdk-alpine
Building bashbrew/cache:429fdd4c99895bc4dc67648e5e35c000dfcbdfefdbc01c835fbbe3798b9aecb2 (jruby:9-jdk-alpine)
Tagging jruby:9-jdk-alpine
Tagging jruby:9.2-jdk-alpine
Tagging jruby:9.2.6-jdk-alpine
Tagging jruby:9.2.6.0-jdk-alpine
$ test/run.sh jruby:9-jdk-alpine
testing jruby:9-jdk-alpine
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'ruby-hello-world' [5/7]...passed
'ruby-standard-libs' [6/7]...passed
'ruby-nonroot' [7/7]...passed
$ bashbrew build jruby:9.1
Building bashbrew/cache:83574e37b39718b1187ff36223b371e576bf0e8b328591617a250055e075b202 (jruby:9.1)
Tagging jruby:9.1
Tagging jruby:9.1.17
Tagging jruby:9.1.17.0
Tagging jruby:9.1-jre
Tagging jruby:9.1.17-jre
Tagging jruby:9.1.17.0-jre
$ test/run.sh jruby:9.1
testing jruby:9.1
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...passed
'override-cmd' [4/9]...passed
'ruby-hello-world' [5/9]...passed
'ruby-standard-libs' [6/9]...passed
'ruby-gems' [7/9]...skipping activesupport due to required Ruby version: >= 2.5.0 (vs 2.3.3)
passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9.1-alpine
Building bashbrew/cache:fab12b7a930e9815548ff7e45050ba1168a7c0b2d0bf8fa738467d8dd3712242 (jruby:9.1-alpine)
Tagging jruby:9.1-alpine
Tagging jruby:9.1.17-alpine
Tagging jruby:9.1.17.0-alpine
Tagging jruby:9.1-jre-alpine
Tagging jruby:9.1.17-jre-alpine
Tagging jruby:9.1.17.0-jre-alpine
$ test/run.sh jruby:9.1-alpine
testing jruby:9.1-alpine
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'ruby-hello-world' [5/7]...passed
'ruby-standard-libs' [6/7]...passed
'ruby-nonroot' [7/7]...passed
$ bashbrew build jruby:9.1-jdk-alpine
Building bashbrew/cache:0dfcf2848c3ffd2bdff3e53e9f65e46a20fd11657087639ca60633cee315fdcb (jruby:9.1-jdk-alpine)
Tagging jruby:9.1-jdk-alpine
Tagging jruby:9.1.17-jdk-alpine
Tagging jruby:9.1.17.0-jdk-alpine
$ test/run.sh jruby:9.1-jdk-alpine
testing jruby:9.1-jdk-alpine
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'ruby-hello-world' [5/7]...passed
'ruby-standard-libs' [6/7]...passed
'ruby-nonroot' [7/7]...passed
$ bashbrew build jruby:9.1-jdk
Building bashbrew/cache:68cde125f81347912ecbe16a08fca84a20f17984951f12488d8648faff6301e1 (jruby:9.1-jdk)
Tagging jruby:9.1-jdk
Tagging jruby:9.1.17-jdk
Tagging jruby:9.1.17.0-jdk
$ test/run.sh jruby:9.1-jdk
testing jruby:9.1-jdk
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...passed
'override-cmd' [4/9]...passed
'ruby-hello-world' [5/9]...passed
'ruby-standard-libs' [6/9]...passed
'ruby-gems' [7/9]...skipping activesupport due to required Ruby version: >= 2.5.0 (vs 2.3.3)
passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9-onbuild
Building bashbrew/cache:2899bd5e8c617f79b74ac774b36dd563cbf5eb12f5bbff54245c22e502d6feec (jruby:9-onbuild)
Tagging jruby:9-onbuild
Tagging jruby:9.2-onbuild
Tagging jruby:9.2.6-onbuild
Tagging jruby:9.2.6.0-onbuild
$ test/run.sh jruby:9-onbuild
testing jruby:9-onbuild
'override-cmd' [1/1]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.