Upgrade Bazel and Bazelist; add ruby 2.7.0

kigster · kigster · commit ab99ed69ee59 · 2020-02-27T03:50:18.000-08:00
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-2.0.0
+2.1.1
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
@@ -1,7 +1,7 @@
 #
 # rules_ruby circleci Docker file.
 #
-FROM ruby:2.6.5-stretch
+FROM ruby:2.7.0
 
 # make Apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
@@ -90,9 +90,9 @@ RUN groupadd --gid 3434 circleci \
 
 RUN apt-get update && apt-get upgrade
 
-RUN apt-get install -y openjdk-8-jdk python2.7 python3 golang-go
+RUN apt-get install -y openjdk-11-jdk python2.7 python3 golang-go
 
-RUN curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.0/bazelisk-linux-amd64 \
+RUN curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.3.0/bazelisk-linux-amd64 \
     && sudo chmod +x /usr/bin/bazel
 
 USER circleci
diff --git a/.circleci/build.sh b/.circleci/build.sh
@@ -1,7 +1,18 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
-docker build . -t bazelruby/ruby-2.6.5
-docker push       bazelruby/ruby-2.6.5
+[[ -d .circleci ]] && cd .circleci
+
+RUBY_VERSION=$(cat ../.ruby-version)
+
+echo
+echo "Ruby version is $RUBY_VERSION"
+echo
+
+set -x 
+
+docker build . -t bazelruby/ruby-$RUBY_VERSION
+
+docker push       bazelruby/ruby-$RUBY_VERSION
 
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
     working_directory: /home/circleci/repo
     resource_class: medium
     docker:
-      - image: bazelruby/ruby-2.6.5
+      - image: bazelruby/ruby-2.7.0
     environment:
       PATH: "/usr/local/bin:/usr/bin:/sbin:/opt/bin:/home/circleci/repo/bin:/bin:/sbin:/usr/sbin"
       BUNDLE_PATH: /home/circleci/.bundle_cache
diff --git a/.ruby-version b/.ruby-version
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,18 +4,20 @@ GEM
     ast (2.4.0)
     jaro_winkler (1.5.4)
     parallel (1.19.1)
-    parser (2.6.5.0)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rubocop (0.78.0)
+    rexml (3.2.4)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
@@ -24,4 +26,4 @@ DEPENDENCIES
   rubocop (~> 0.78)
 
 BUNDLED WITH
-   2.0.2
+   2.1.2
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,6 +1,6 @@
 workspace(name = "bazelruby_ruby_rules")
 
-load("@//ruby:deps.bzl", "ruby_rules_dependencies")
+load("@//ruby:deps.bzl", "ruby_register_toolchains", "ruby_rules_dependencies")
 
 ruby_rules_dependencies()
 
@@ -12,8 +12,6 @@ load("@bazel_skylib//lib:versions.bzl", "versions")
 
 versions.check("1.2.1")
 
-load("@//ruby:deps.bzl", "ruby_register_toolchains")
-
 ruby_register_toolchains()
 
 local_repository(
diff --git a/bin/deps b/bin/deps
@@ -27,7 +27,7 @@ __version::detect() {
 
 # Application Constants
 export RulesRuby__RulesVersion=$(__version::detect .rules_version)
-export RulesRuby__RubyVersion=$(__version::detect .ruby_version)
+export RulesRuby__RubyVersion=2.7.0
 export RulesRuby__BazelVersion=$(__version::detect .bazelversion)
 
 bazel-sha() {
diff --git a/bin/test-suite b/bin/test-suite
@@ -12,7 +12,7 @@ export PATH="${HOME}/.rbenv/bin:${HOME}/.rbenv/shims:/usr/local/bin:/usr/bin:/bi
 export BAZEL_OPTS="--host_jvm_args=-Xmx500m --host_jvm_args=-Xms500m"
 export BAZEL_BUILD_OPTS="--curses=no --verbose_failures -j 15 --show_progress_rate_limit 0 "
 export BAZEL_TEST_OPTS="--verbose_failures --test_output=streamed --test_verbose_timeout_warnings "
-export RUBY_VERSION=$(cat .ruby-version)
+export RUBY_VERSION=2.7.0
 
 export BashMatic__Expr="
   [[ -f ${SHELL_INIT} ]] && source ${SHELL_INIT}
diff --git a/examples/simple_rails_api/.ruby-version b/examples/simple_rails_api/.ruby-version
@@ -1 +1 @@
-2.6.5
+2.7.0
diff --git a/examples/simple_rails_api/Gemfile b/examples/simple_rails_api/Gemfile
@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.5'
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0.2'
 # Use sqlite3 as the database for Active Record
diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock
@@ -1,72 +1,72 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.2)
-      actionpack (= 6.0.2)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2)
-      actionpack (= 6.0.2)
-      activejob (= 6.0.2)
-      activerecord (= 6.0.2)
-      activestorage (= 6.0.2)
-      activesupport (= 6.0.2)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.2)
-      actionpack (= 6.0.2)
-      actionview (= 6.0.2)
-      activejob (= 6.0.2)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2)
-      actionview (= 6.0.2)
-      activesupport (= 6.0.2)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2)
-      actionpack (= 6.0.2)
-      activerecord (= 6.0.2)
-      activestorage (= 6.0.2)
-      activesupport (= 6.0.2)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2)
-      activesupport (= 6.0.2)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2)
-      activesupport (= 6.0.2)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2)
-      activesupport (= 6.0.2)
-    activerecord (6.0.2)
-      activemodel (= 6.0.2)
-      activesupport (= 6.0.2)
-    activestorage (6.0.2)
-      actionpack (= 6.0.2)
-      activejob (= 6.0.2)
-      activerecord (= 6.0.2)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.2)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
-    bootsnap (1.4.5)
+    bootsnap (1.4.6)
       msgpack (~> 1.0)
     builder (3.2.4)
-    byebug (11.0.1)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    byebug (11.1.1)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     erubi (1.9.0)
-    ffi (1.11.3)
+    ffi (1.12.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -80,48 +80,48 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    msgpack (1.3.1)
+    minitest (5.14.0)
+    msgpack (1.3.3)
     nio4r (2.5.2)
     nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     puma (4.3.1)
       nio4r (~> 2.0)
-    rack (2.0.8)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.2)
-      actioncable (= 6.0.2)
-      actionmailbox (= 6.0.2)
-      actionmailer (= 6.0.2)
-      actionpack (= 6.0.2)
-      actiontext (= 6.0.2)
-      actionview (= 6.0.2)
-      activejob (= 6.0.2)
-      activemodel (= 6.0.2)
-      activerecord (= 6.0.2)
-      activestorage (= 6.0.2)
-      activesupport (= 6.0.2)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.2)
+      railties (= 6.0.2.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2)
-      actionpack (= 6.0.2)
-      activesupport (= 6.0.2)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     ruby_dep (1.5.0)
     spring (2.1.0)
@@ -135,10 +135,10 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.1)
-    thor (1.0.0)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
@@ -159,8 +159,5 @@ DEPENDENCIES
   sqlite3 (~> 1.4)
   tzinfo-data
 
-RUBY VERSION
-   ruby 2.6.5p114
-
 BUNDLED WITH
-   2.0.2
+   2.1.2
diff --git a/examples/simple_rails_api/WORKSPACE b/examples/simple_rails_api/WORKSPACE
@@ -15,7 +15,7 @@ load(
 
 ruby_rules_dependencies()
 
-ruby_register_toolchains(version = "2.6.5")
+ruby_register_toolchains(version = "2.7.0")
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
diff --git a/examples/simple_script/.ruby-version b/examples/simple_script/.ruby-version
diff --git a/examples/simple_script/Gemfile.lock b/examples/simple_script/Gemfile.lock
@@ -7,7 +7,7 @@ GEM
     diff-lcs (1.3)
     jaro_winkler (1.5.4)
     parallel (1.19.1)
-    parser (2.6.5.0)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
     rainbow (3.0.0)
     rspec (3.7.0)
@@ -34,7 +34,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
diff --git a/examples/simple_script/WORKSPACE b/examples/simple_script/WORKSPACE
@@ -15,7 +15,7 @@ load(
 
 ruby_rules_dependencies()
 
-ruby_register_toolchains(version = "2.6.5")
+ruby_register_toolchains(version = "2.7.0")
 
 load("@bazelruby_ruby_rules//ruby:defs.bzl", "ruby_bundle")
 
diff --git a/ruby/private/sdk.bzl b/ruby/private/sdk.bzl
@@ -6,7 +6,7 @@ load(
 def ruby_register_toolchains(version = "host"):
     """Registers ruby toolchains in the WORKSPACE file."""
 
-    supported_versions = ["host", "2.6.3", "2.6.5"]
+    supported_versions = ["host", "2.6.3", "2.6.5", "2.7.0"]
     if version in supported_versions:
         _ruby_runtime(
             name = "org_ruby_lang_ruby_toolchain",
diff --git a/ruby/private/toolchains/ruby_runtime.bzl b/ruby/private/toolchains/ruby_runtime.bzl
