From e0f00b9a0841c8b0f78faecd07afb4c5754b3c27 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Sat, 28 Dec 2019 01:27:26 +0800 Subject: [PATCH] Upgrade to Ruby 2.7.0 GA (#301) --- .travis.yml | 6 +++--- {2.7-rc => 2.7}/alpine3.10/Dockerfile | 6 +++--- {2.7-rc => 2.7}/buster/Dockerfile | 6 +++--- {2.7-rc => 2.7}/buster/slim/Dockerfile | 6 +++--- generate-stackbrew-library.sh | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) rename {2.7-rc => 2.7}/alpine3.10/Dockerfile (96%) rename {2.7-rc => 2.7}/buster/Dockerfile (94%) rename {2.7-rc => 2.7}/buster/slim/Dockerfile (95%) diff --git a/.travis.yml b/.travis.yml index 2b8deb64c..a5ac920f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: bash services: docker env: - - VERSION=2.7-rc VARIANT=buster - - VERSION=2.7-rc VARIANT=buster/slim - - VERSION=2.7-rc VARIANT=alpine3.10 + - VERSION=2.7 VARIANT=buster + - VERSION=2.7 VARIANT=buster/slim + - VERSION=2.7 VARIANT=alpine3.10 - VERSION=2.6 VARIANT=buster - VERSION=2.6 VARIANT=buster/slim - VERSION=2.6 VARIANT=stretch diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7/alpine3.10/Dockerfile similarity index 96% rename from 2.7-rc/alpine3.10/Dockerfile rename to 2.7/alpine3.10/Dockerfile index 15257e982..7062c3e64 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7/alpine3.10/Dockerfile @@ -11,9 +11,9 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.0 +ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/Dockerfile b/2.7/buster/Dockerfile similarity index 94% rename from 2.7-rc/buster/Dockerfile rename to 2.7/buster/Dockerfile index 47b442dc2..a97947efb 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -8,9 +8,9 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.0 +ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile similarity index 95% rename from 2.7-rc/buster/slim/Dockerfile rename to 2.7/buster/slim/Dockerfile index ad4479281..6eb2a2cc2 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -22,9 +22,9 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.0 +ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d3ae01256..d4c817faa 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,13 +2,13 @@ set -Eeuo pipefail declare -A aliases=( - [2.6]='2 latest' - [2.7-rc]='rc' + [2.8-rc]='rc' + [2.7]='2 latest' ) defaultDebianSuite='buster' declare -A debianSuites=( - #[2.7-rc]='buster' + #[2.7]='buster' ) defaultAlpineVersion='3.10' declare -A alpineVersion=(