diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-11 16:25:55 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-11 18:09:37 -0700 |
commit | e529d162838f747362c123ec10e87ebe3970c677 (patch) | |
tree | a92f5abb10a6ae1ec4108d5c98e2e3f528e3696e | |
parent | 82019f90fff5c44477f91084c84b24989a93df7a (diff) | |
download | protobuf-e529d162838f747362c123ec10e87ebe3970c677.tar.gz protobuf-e529d162838f747362c123ec10e87ebe3970c677.tar.bz2 protobuf-e529d162838f747362c123ec10e87ebe3970c677.zip |
Make ruby release configs consistent with protoc.
-rwxr-xr-x | kokoro/release/linux/build_artifacts.sh | 14 | ||||
-rwxr-xr-x | kokoro/release/ruby/linux/build_artifacts.sh | 14 | ||||
-rwxr-xr-x | kokoro/release/ruby/linux/prepare_build.sh (renamed from kokoro/release/linux/prepare_build.sh) | 0 | ||||
-rw-r--r-- | kokoro/release/ruby/linux/release.cfg (renamed from kokoro/release/linux/release.cfg) | 2 | ||||
-rwxr-xr-x | kokoro/release/ruby/linux/ruby/ruby_build.sh (renamed from kokoro/release/linux/ruby/ruby_build.sh) | 0 | ||||
-rwxr-xr-x | kokoro/release/ruby/linux/ruby/ruby_build_environment.sh (renamed from kokoro/release/linux/ruby/ruby_build_environment.sh) | 0 | ||||
-rwxr-xr-x | kokoro/release/ruby/macos/build_artifacts.sh (renamed from kokoro/release/macos/build_artifacts.sh) | 6 | ||||
-rw-r--r-- | kokoro/release/ruby/macos/release.cfg (renamed from kokoro/release/macos/release.cfg) | 2 | ||||
-rwxr-xr-x | kokoro/release/ruby/macos/ruby/ruby_build.sh (renamed from kokoro/release/macos/ruby/ruby_build.sh) | 0 | ||||
-rwxr-xr-x | kokoro/release/ruby/macos/ruby/ruby_build_environment.sh (renamed from kokoro/release/macos/ruby/ruby_build_environment.sh) | 0 |
10 files changed, 19 insertions, 19 deletions
diff --git a/kokoro/release/linux/build_artifacts.sh b/kokoro/release/linux/build_artifacts.sh deleted file mode 100755 index ae7dc813..00000000 --- a/kokoro/release/linux/build_artifacts.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -ex - -# change to repo root -cd $(dirname $0)/../../.. - -source kokoro/release/linux/prepare_build.sh - -# ruby environment -source kokoro/release/linux/ruby/ruby_build_environment.sh - -# build artifacts -bash kokoro/release/linux/ruby/ruby_build.sh diff --git a/kokoro/release/ruby/linux/build_artifacts.sh b/kokoro/release/ruby/linux/build_artifacts.sh new file mode 100755 index 00000000..88555226 --- /dev/null +++ b/kokoro/release/ruby/linux/build_artifacts.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -ex + +# change to repo root +cd $(dirname $0)/../../../.. + +source kokoro/release/ruby/linux/prepare_build.sh + +# ruby environment +source kokoro/release/ruby/linux/ruby/ruby_build_environment.sh + +# build artifacts +bash kokoro/release/ruby/linux/ruby/ruby_build.sh diff --git a/kokoro/release/linux/prepare_build.sh b/kokoro/release/ruby/linux/prepare_build.sh index d3ff8764..d3ff8764 100755 --- a/kokoro/release/linux/prepare_build.sh +++ b/kokoro/release/ruby/linux/prepare_build.sh diff --git a/kokoro/release/linux/release.cfg b/kokoro/release/ruby/linux/release.cfg index 5dae7019..dbc71b2c 100644 --- a/kokoro/release/linux/release.cfg +++ b/kokoro/release/ruby/linux/release.cfg @@ -1,5 +1,5 @@ # Configuration for Linux release builds -build_file: "protobuf/kokoro/release/linux/build_artifacts.sh" +build_file: "protobuf/kokoro/release/ruby/linux/build_artifacts.sh" action { define_artifacts { diff --git a/kokoro/release/linux/ruby/ruby_build.sh b/kokoro/release/ruby/linux/ruby/ruby_build.sh index cf6b433d..cf6b433d 100755 --- a/kokoro/release/linux/ruby/ruby_build.sh +++ b/kokoro/release/ruby/linux/ruby/ruby_build.sh diff --git a/kokoro/release/linux/ruby/ruby_build_environment.sh b/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh index ea04f905..ea04f905 100755 --- a/kokoro/release/linux/ruby/ruby_build_environment.sh +++ b/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh diff --git a/kokoro/release/macos/build_artifacts.sh b/kokoro/release/ruby/macos/build_artifacts.sh index 23135ca3..c68b63cc 100755 --- a/kokoro/release/macos/build_artifacts.sh +++ b/kokoro/release/ruby/macos/build_artifacts.sh @@ -3,17 +3,17 @@ set -ex # change to repo root -cd $(dirname $0)/../../.. +cd $(dirname $0)/../../../.. # all artifacts come here mkdir artifacts export ARTIFACT_DIR=$(pwd)/artifacts # ruby environment -bash kokoro/release/macos/ruby/ruby_build_environment.sh +bash kokoro/release/ruby/macos/ruby/ruby_build_environment.sh gem install rubygems-update update_rubygems # build artifacts -bash kokoro/release/macos/ruby/ruby_build.sh +bash kokoro/release/ruby/macos/ruby/ruby_build.sh diff --git a/kokoro/release/macos/release.cfg b/kokoro/release/ruby/macos/release.cfg index 35d36dee..cb1c08bb 100644 --- a/kokoro/release/macos/release.cfg +++ b/kokoro/release/ruby/macos/release.cfg @@ -1,5 +1,5 @@ # Configuration for Mac OSX release builds -build_file: "protobuf/kokoro/release/macos/build_artifacts.sh" +build_file: "protobuf/kokoro/release/ruby/macos/build_artifacts.sh" action { define_artifacts { diff --git a/kokoro/release/macos/ruby/ruby_build.sh b/kokoro/release/ruby/macos/ruby/ruby_build.sh index cf6b433d..cf6b433d 100755 --- a/kokoro/release/macos/ruby/ruby_build.sh +++ b/kokoro/release/ruby/macos/ruby/ruby_build.sh diff --git a/kokoro/release/macos/ruby/ruby_build_environment.sh b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh index e9c619cd..e9c619cd 100755 --- a/kokoro/release/macos/ruby/ruby_build_environment.sh +++ b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh |