File tree Expand file tree Collapse file tree 6 files changed +12
-8
lines changed
release/ruby_rake_compiler Expand file tree Collapse file tree 6 files changed +12
-8
lines changed Original file line number Diff line number Diff line change 8
8
9
9
DOCKERHUB_ORGANIZATION=protobuftesting
10
10
11
- for DOCKERFILE_DIR in test/*
11
+ for DOCKERFILE_DIR in test/* release/ *
12
12
do
13
13
# Generate image name based on Dockerfile checksum. That works well as long
14
14
# as can count on dockerfiles being written in a way that changing the logical
Original file line number Diff line number Diff line change
1
+ FROM grpctesting/rake-compiler-dock_53c22085d091183c528303791e7771359f699bcf
2
+
3
+ RUN /bin/bash -l -c "gem install bundler"
Original file line number Diff line number Diff line change @@ -18,9 +18,8 @@ export CXX=g++
18
18
19
19
ruby -e " $( curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install) "
20
20
source $HOME /.rvm/scripts/rvm
21
- brew tap homebrew/homebrew-php
22
21
brew uninstall node icu4c
23
- brew install gflags gpg gpg2 node pcre php56 ruby
22
+ brew install gflags gpg gpg2 node pcre ruby
24
23
25
24
# #
26
25
# Install Tox
Original file line number Diff line number Diff line change @@ -8,9 +8,11 @@ echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | su
8
8
sudo service docker restart
9
9
10
10
# 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\ )
12
15
13
16
# All artifacts come here
14
17
mkdir artifacts
15
18
export ARTIFACT_DIR=$( pwd) /artifacts
16
-
Original file line number Diff line number Diff line change 47
47
48
48
MAKE=" make -j8"
49
49
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
51
51
ccache -c
52
52
rake -f " $CROSS_RUBY " cross-ruby VERSION=" $v " HOST=x86_64-darwin11 MAKE=" $MAKE "
53
53
done
Original file line number Diff line number Diff line change 70
70
71
71
task 'gem:windows' do
72
72
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"
74
74
end
75
75
76
76
if RUBY_PLATFORM =~ /darwin/
77
77
task 'gem:native' do
78
78
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"
80
80
end
81
81
else
82
82
task 'gem:native' => [ :genproto , 'gem:windows' ]
You can’t perform that action at this time.
0 commit comments