Skip to content
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.

Sign up for GitHub

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

Add ruby 2.6 gem build for linux #5537

Merged
merged 6 commits into from
Jan 8, 2019
Merged

Add ruby 2.6 gem build for linux #5537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b89fd6
Add ruby 2.6 gem build for linux
TeBoring Jan 4, 2019
4aa809b
Add docker hub organization
TeBoring Jan 4, 2019
5012848
Add ruby2.6 in cross compile targets
TeBoring Jan 4, 2019
37b3332
Fix tests
TeBoring Jan 7, 2019
79761eb
Check mac version
TeBoring Jan 8, 2019
7d150fb
No need to install php in preparation for mac
TeBoring Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kokoro/linux/dockerfile/push_testing_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd -

DOCKERHUB_ORGANIZATION=protobuftesting

for DOCKERFILE_DIR in test/*
for DOCKERFILE_DIR in test/* release/*
do
# Generate image name based on Dockerfile checksum. That works well as long
# as can count on dockerfiles being written in a way that changing the logical
Expand Down
3 changes: 3 additions & 0 deletions kokoro/linux/dockerfile/release/ruby_rake_compiler/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM grpctesting/rake-compiler-dock_53c22085d091183c528303791e7771359f699bcf

RUN /bin/bash -l -c "gem install bundler"
3 changes: 1 addition & 2 deletions kokoro/macos/prepare_build_macos_rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ export CXX=g++

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

##
# Install Tox
Expand Down
6 changes: 4 additions & 2 deletions kokoro/release/ruby/linux/prepare_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | su
sudo service docker restart

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

# All artifacts come here
mkdir artifacts
export ARTIFACT_DIR=$(pwd)/artifacts

2 changes: 1 addition & 1 deletion kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ EOF

MAKE="make -j8"

for v in 2.5.0 2.4.0 2.3.0 2.2.2 2.1.6 2.0.0-p645 ; do
for v in 2.6.0 2.5.1 2.4.0 2.3.0 ; do
ccache -c
rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin11 MAKE="$MAKE"
done
Expand Down
4 changes: 2 additions & 2 deletions ruby/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ else

task 'gem:windows' do
require 'rake_compiler_dock'
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"
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"
end

if RUBY_PLATFORM =~ /darwin/
task 'gem:native' do
system "rake genproto"
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"
system "rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.1:2.4.0:2.3.0"
end
else
task 'gem:native' => [:genproto, 'gem:windows']
Expand Down