Skip to content

Commit c3340b2

Browse files
authored
Add ruby 2.6 gem build for linux (protocolbuffers#5537)
* Add ruby 2.6 gem build for linux * Add docker hub organization * Add ruby2.6 in cross compile targets * Fix tests * Check mac version * No need to install php in preparation for mac
1 parent 24d344c commit c3340b2

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

kokoro/linux/dockerfile/push_testing_images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cd -
88

99
DOCKERHUB_ORGANIZATION=protobuftesting
1010

11-
for DOCKERFILE_DIR in test/*
11+
for DOCKERFILE_DIR in test/* release/*
1212
do
1313
# Generate image name based on Dockerfile checksum. That works well as long
1414
# as can count on dockerfiles being written in a way that changing the logical
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM grpctesting/rake-compiler-dock_53c22085d091183c528303791e7771359f699bcf
2+
3+
RUN /bin/bash -l -c "gem install bundler"

kokoro/macos/prepare_build_macos_rc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ export CXX=g++
1818

1919
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
2020
source $HOME/.rvm/scripts/rvm
21-
brew tap homebrew/homebrew-php
2221
brew uninstall node icu4c
23-
brew install gflags gpg gpg2 node pcre php56 ruby
22+
brew install gflags gpg gpg2 node pcre ruby
2423

2524
##
2625
# Install Tox

kokoro/release/ruby/linux/prepare_build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | su
88
sudo service docker restart
99

1010
# Download Docker images from DockerHub
11-
export DOCKERHUB_ORGANIZATION=grpctesting
11+
DOCKERHUB_ORGANIZATION=protobuftesting
12+
DOCKERFILE_DIR=kokoro/linux/dockerfile/release/ruby_rake_compiler
13+
DOCKERFILE_PREFIX=$(basename $DOCKERFILE_DIR)
14+
export RAKE_COMPILER_DOCK_IMAGE=${DOCKERHUB_ORGANIZATION}/${DOCKERFILE_PREFIX}_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ )
1215

1316
# All artifacts come here
1417
mkdir artifacts
1518
export ARTIFACT_DIR=$(pwd)/artifacts
16-

kokoro/release/ruby/macos/ruby/ruby_build_environment.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ EOF
4747

4848
MAKE="make -j8"
4949

50-
for v in 2.5.0 2.4.0 2.3.0 2.2.2 2.1.6 2.0.0-p645 ; do
50+
for v in 2.6.0 2.5.1 2.4.0 2.3.0 ; do
5151
ccache -c
5252
rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin11 MAKE="$MAKE"
5353
done

ruby/Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ else
7070

7171
task 'gem:windows' do
7272
require 'rake_compiler_dock'
73-
RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0"
73+
RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0"
7474
end
7575

7676
if RUBY_PLATFORM =~ /darwin/
7777
task 'gem:native' do
7878
system "rake genproto"
79-
system "rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0"
79+
system "rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.1:2.4.0:2.3.0"
8080
end
8181
else
8282
task 'gem:native' => [:genproto, 'gem:windows']

0 commit comments

Comments
 (0)