Skip to content

Commit ab99ed6

Browse files
kigsterkigster
committed
Upgrade Bazel and Bazelist; add ruby 2.7.0
1 parent ac3a727 commit ab99ed6

File tree

18 files changed

+105
-101
lines changed

18 files changed

+105
-101
lines changed

‎.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0
1+
2.1.1

‎.circleci/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# rules_ruby circleci Docker file.
33
#
4-
FROM ruby:2.6.5-stretch
4+
FROM ruby:2.7.0
55

66
# make Apt non-interactive
77
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
@@ -90,9 +90,9 @@ RUN groupadd --gid 3434 circleci \
9090

9191
RUN apt-get update && apt-get upgrade
9292

93-
RUN apt-get install -y openjdk-8-jdk python2.7 python3 golang-go
93+
RUN apt-get install -y openjdk-11-jdk python2.7 python3 golang-go
9494

95-
RUN curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.0/bazelisk-linux-amd64 \
95+
RUN curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.3.0/bazelisk-linux-amd64 \
9696
&& sudo chmod +x /usr/bin/bazel
9797

9898
USER circleci

‎.circleci/build.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
#!/usr/bin/env bash
22

3-
set -ex
3+
set -e
44

5-
docker build . -t bazelruby/ruby-2.6.5
6-
docker push bazelruby/ruby-2.6.5
5+
[[ -d .circleci ]] && cd .circleci
6+
7+
RUBY_VERSION=$(cat ../.ruby-version)
8+
9+
echo
10+
echo "Ruby version is $RUBY_VERSION"
11+
echo
12+
13+
set -x
14+
15+
docker build . -t bazelruby/ruby-$RUBY_VERSION
16+
17+
docker push bazelruby/ruby-$RUBY_VERSION
718

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
working_directory: /home/circleci/repo
66
resource_class: medium
77
docker:
8-
- image: bazelruby/ruby-2.6.5
8+
- image: bazelruby/ruby-2.7.0
99
environment:
1010
PATH: "/usr/local/bin:/usr/bin:/sbin:/opt/bin:/home/circleci/repo/bin:/bin:/sbin:/usr/sbin"
1111
BUNDLE_PATH: /home/circleci/.bundle_cache

‎.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Gemfile.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ GEM
44
ast (2.4.0)
55
jaro_winkler (1.5.4)
66
parallel (1.19.1)
7-
parser (2.6.5.0)
7+
parser (2.7.0.3)
88
ast (~> 2.4.0)
99
rainbow (3.0.0)
10-
rubocop (0.78.0)
10+
rexml (3.2.4)
11+
rubocop (0.80.0)
1112
jaro_winkler (~> 1.5.1)
1213
parallel (~> 1.10)
13-
parser (>= 2.6)
14+
parser (>= 2.7.0.1)
1415
rainbow (>= 2.2.2, < 4.0)
16+
rexml
1517
ruby-progressbar (~> 1.7)
1618
unicode-display_width (>= 1.4.0, < 1.7)
1719
ruby-progressbar (1.10.1)
18-
unicode-display_width (1.6.0)
20+
unicode-display_width (1.6.1)
1921

2022
PLATFORMS
2123
ruby
@@ -24,4 +26,4 @@ DEPENDENCIES
2426
rubocop (~> 0.78)
2527

2628
BUNDLED WITH
27-
2.0.2
29+
2.1.2

‎WORKSPACE

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
workspace(name = "bazelruby_ruby_rules")
22

3-
load("@//ruby:deps.bzl", "ruby_rules_dependencies")
3+
load("@//ruby:deps.bzl", "ruby_register_toolchains", "ruby_rules_dependencies")
44

55
ruby_rules_dependencies()
66

@@ -12,8 +12,6 @@ load("@bazel_skylib//lib:versions.bzl", "versions")
1212

1313
versions.check("1.2.1")
1414

15-
load("@//ruby:deps.bzl", "ruby_register_toolchains")
16-
1715
ruby_register_toolchains()
1816

1917
local_repository(

‎bin/deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ __version::detect() {
2727

2828
# Application Constants
2929
export RulesRuby__RulesVersion=$(__version::detect .rules_version)
30-
export RulesRuby__RubyVersion=$(__version::detect .ruby_version)
30+
export RulesRuby__RubyVersion=2.7.0
3131
export RulesRuby__BazelVersion=$(__version::detect .bazelversion)
3232

3333
bazel-sha() {

‎bin/test-suite

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export PATH="${HOME}/.rbenv/bin:${HOME}/.rbenv/shims:/usr/local/bin:/usr/bin:/bi
1212
export BAZEL_OPTS="--host_jvm_args=-Xmx500m --host_jvm_args=-Xms500m"
1313
export BAZEL_BUILD_OPTS="--curses=no --verbose_failures -j 15 --show_progress_rate_limit 0 "
1414
export BAZEL_TEST_OPTS="--verbose_failures --test_output=streamed --test_verbose_timeout_warnings "
15-
export RUBY_VERSION=$(cat .ruby-version)
15+
export RUBY_VERSION=2.7.0
1616

1717
export BashMatic__Expr="
1818
[[ -f ${SHELL_INIT} ]] && source ${SHELL_INIT}

‎examples/simple_rails_api/.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.5
1+
2.7.0

‎examples/simple_rails_api/Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby '2.6.5'
5-
64
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
75
gem 'rails', '~> 6.0.2'
86
# Use sqlite3 as the database for Active Record

‎examples/simple_rails_api/Gemfile.lock

Lines changed: 66 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.2)
5-
actionpack (= 6.0.2)
4+
actioncable (6.0.2.1)
5+
actionpack (= 6.0.2.1)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.2)
9-
actionpack (= 6.0.2)
10-
activejob (= 6.0.2)
11-
activerecord (= 6.0.2)
12-
activestorage (= 6.0.2)
13-
activesupport (= 6.0.2)
8+
actionmailbox (6.0.2.1)
9+
actionpack (= 6.0.2.1)
10+
activejob (= 6.0.2.1)
11+
activerecord (= 6.0.2.1)
12+
activestorage (= 6.0.2.1)
13+
activesupport (= 6.0.2.1)
1414
mail (>= 2.7.1)
15-
actionmailer (6.0.2)
16-
actionpack (= 6.0.2)
17-
actionview (= 6.0.2)
18-
activejob (= 6.0.2)
15+
actionmailer (6.0.2.1)
16+
actionpack (= 6.0.2.1)
17+
actionview (= 6.0.2.1)
18+
activejob (= 6.0.2.1)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.2)
22-
actionview (= 6.0.2)
23-
activesupport (= 6.0.2)
24-
rack (~> 2.0)
21+
actionpack (6.0.2.1)
22+
actionview (= 6.0.2.1)
23+
activesupport (= 6.0.2.1)
24+
rack (~> 2.0, >= 2.0.8)
2525
rack-test (>= 0.6.3)
2626
rails-dom-testing (~> 2.0)
2727
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.2)
29-
actionpack (= 6.0.2)
30-
activerecord (= 6.0.2)
31-
activestorage (= 6.0.2)
32-
activesupport (= 6.0.2)
28+
actiontext (6.0.2.1)
29+
actionpack (= 6.0.2.1)
30+
activerecord (= 6.0.2.1)
31+
activestorage (= 6.0.2.1)
32+
activesupport (= 6.0.2.1)
3333
nokogiri (>= 1.8.5)
34-
actionview (6.0.2)
35-
activesupport (= 6.0.2)
34+
actionview (6.0.2.1)
35+
activesupport (= 6.0.2.1)
3636
builder (~> 3.1)
3737
erubi (~> 1.4)
3838
rails-dom-testing (~> 2.0)
3939
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.2)
41-
activesupport (= 6.0.2)
40+
activejob (6.0.2.1)
41+
activesupport (= 6.0.2.1)
4242
globalid (>= 0.3.6)
43-
activemodel (6.0.2)
44-
activesupport (= 6.0.2)
45-
activerecord (6.0.2)
46-
activemodel (= 6.0.2)
47-
activesupport (= 6.0.2)
48-
activestorage (6.0.2)
49-
actionpack (= 6.0.2)
50-
activejob (= 6.0.2)
51-
activerecord (= 6.0.2)
43+
activemodel (6.0.2.1)
44+
activesupport (= 6.0.2.1)
45+
activerecord (6.0.2.1)
46+
activemodel (= 6.0.2.1)
47+
activesupport (= 6.0.2.1)
48+
activestorage (6.0.2.1)
49+
actionpack (= 6.0.2.1)
50+
activejob (= 6.0.2.1)
51+
activerecord (= 6.0.2.1)
5252
marcel (~> 0.3.1)
53-
activesupport (6.0.2)
53+
activesupport (6.0.2.1)
5454
concurrent-ruby (~> 1.0, >= 1.0.2)
5555
i18n (>= 0.7, < 2)
5656
minitest (~> 5.1)
5757
tzinfo (~> 1.1)
5858
zeitwerk (~> 2.2)
59-
bootsnap (1.4.5)
59+
bootsnap (1.4.6)
6060
msgpack (~> 1.0)
6161
builder (3.2.4)
62-
byebug (11.0.1)
63-
concurrent-ruby (1.1.5)
64-
crass (1.0.5)
62+
byebug (11.1.1)
63+
concurrent-ruby (1.1.6)
64+
crass (1.0.6)
6565
erubi (1.9.0)
66-
ffi (1.11.3)
66+
ffi (1.12.2)
6767
globalid (0.4.2)
6868
activesupport (>= 4.2.0)
69-
i18n (1.7.0)
69+
i18n (1.8.2)
7070
concurrent-ruby (~> 1.0)
7171
listen (3.1.5)
7272
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -80,48 +80,48 @@ GEM
8080
marcel (0.3.3)
8181
mimemagic (~> 0.3.2)
8282
method_source (0.9.2)
83-
mimemagic (0.3.3)
83+
mimemagic (0.3.4)
8484
mini_mime (1.0.2)
8585
mini_portile2 (2.4.0)
86-
minitest (5.13.0)
87-
msgpack (1.3.1)
86+
minitest (5.14.0)
87+
msgpack (1.3.3)
8888
nio4r (2.5.2)
8989
nokogiri (1.10.8)
9090
mini_portile2 (~> 2.4.0)
9191
puma (4.3.1)
9292
nio4r (~> 2.0)
93-
rack (2.0.8)
93+
rack (2.2.2)
9494
rack-test (1.1.0)
9595
rack (>= 1.0, < 3)
96-
rails (6.0.2)
97-
actioncable (= 6.0.2)
98-
actionmailbox (= 6.0.2)
99-
actionmailer (= 6.0.2)
100-
actionpack (= 6.0.2)
101-
actiontext (= 6.0.2)
102-
actionview (= 6.0.2)
103-
activejob (= 6.0.2)
104-
activemodel (= 6.0.2)
105-
activerecord (= 6.0.2)
106-
activestorage (= 6.0.2)
107-
activesupport (= 6.0.2)
96+
rails (6.0.2.1)
97+
actioncable (= 6.0.2.1)
98+
actionmailbox (= 6.0.2.1)
99+
actionmailer (= 6.0.2.1)
100+
actionpack (= 6.0.2.1)
101+
actiontext (= 6.0.2.1)
102+
actionview (= 6.0.2.1)
103+
activejob (= 6.0.2.1)
104+
activemodel (= 6.0.2.1)
105+
activerecord (= 6.0.2.1)
106+
activestorage (= 6.0.2.1)
107+
activesupport (= 6.0.2.1)
108108
bundler (>= 1.3.0)
109-
railties (= 6.0.2)
109+
railties (= 6.0.2.1)
110110
sprockets-rails (>= 2.0.0)
111111
rails-dom-testing (2.0.3)
112112
activesupport (>= 4.2.0)
113113
nokogiri (>= 1.6)
114114
rails-html-sanitizer (1.3.0)
115115
loofah (~> 2.3)
116-
railties (6.0.2)
117-
actionpack (= 6.0.2)
118-
activesupport (= 6.0.2)
116+
railties (6.0.2.1)
117+
actionpack (= 6.0.2.1)
118+
activesupport (= 6.0.2.1)
119119
method_source
120120
rake (>= 0.8.7)
121121
thor (>= 0.20.3, < 2.0)
122122
rake (13.0.1)
123123
rb-fsevent (0.10.3)
124-
rb-inotify (0.10.0)
124+
rb-inotify (0.10.1)
125125
ffi (~> 1.0)
126126
ruby_dep (1.5.0)
127127
spring (2.1.0)
@@ -135,10 +135,10 @@ GEM
135135
actionpack (>= 4.0)
136136
activesupport (>= 4.0)
137137
sprockets (>= 3.0.0)
138-
sqlite3 (1.4.1)
139-
thor (1.0.0)
138+
sqlite3 (1.4.2)
139+
thor (1.0.1)
140140
thread_safe (0.3.6)
141-
tzinfo (1.2.5)
141+
tzinfo (1.2.6)
142142
thread_safe (~> 0.1)
143143
websocket-driver (0.7.1)
144144
websocket-extensions (>= 0.1.0)
@@ -159,8 +159,5 @@ DEPENDENCIES
159159
sqlite3 (~> 1.4)
160160
tzinfo-data
161161

162-
RUBY VERSION
163-
ruby 2.6.5p114
164-
165162
BUNDLED WITH
166-
2.0.2
163+
2.1.2

‎examples/simple_rails_api/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ load(
1515

1616
ruby_rules_dependencies()
1717

18-
ruby_register_toolchains(version = "2.6.5")
18+
ruby_register_toolchains(version = "2.7.0")
1919

2020
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
2121

‎examples/simple_script/.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/simple_script/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
diff-lcs (1.3)
88
jaro_winkler (1.5.4)
99
parallel (1.19.1)
10-
parser (2.6.5.0)
10+
parser (2.7.0.3)
1111
ast (~> 2.4.0)
1212
rainbow (3.0.0)
1313
rspec (3.7.0)
@@ -34,7 +34,7 @@ GEM
3434
ruby-progressbar (~> 1.7)
3535
unicode-display_width (>= 1.4.0, < 1.7)
3636
ruby-progressbar (1.10.1)
37-
unicode-display_width (1.6.0)
37+
unicode-display_width (1.6.1)
3838

3939
PLATFORMS
4040
ruby

‎examples/simple_script/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ load(
1515

1616
ruby_rules_dependencies()
1717

18-
ruby_register_toolchains(version = "2.6.5")
18+
ruby_register_toolchains(version = "2.7.0")
1919

2020
load("@bazelruby_ruby_rules//ruby:defs.bzl", "ruby_bundle")
2121

‎ruby/private/sdk.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ load(
66
def ruby_register_toolchains(version = "host"):
77
"""Registers ruby toolchains in the WORKSPACE file."""
88

9-
supported_versions = ["host", "2.6.3", "2.6.5"]
9+
supported_versions = ["host", "2.6.3", "2.6.5", "2.7.0"]
1010
if version in supported_versions:
1111
_ruby_runtime(
1212
name = "org_ruby_lang_ruby_toolchain",

0 commit comments

Comments
 (0)