Browse Source

Merge pull request #4899 from xfxyjwf/kokoro

Make ruby release configs consistent with protoc.
Feng Xiao 7 years ago
parent
commit
39aabeab54

+ 0 - 14
kokoro/release/linux/build_artifacts.sh

@@ -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

+ 14 - 0
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

+ 0 - 0
kokoro/release/linux/prepare_build.sh → kokoro/release/ruby/linux/prepare_build.sh


+ 1 - 1
kokoro/release/linux/release.cfg → kokoro/release/ruby/linux/release.cfg

@@ -1,5 +1,5 @@
 # Configuration for Linux release builds
 # 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 {
 action {
   define_artifacts {
   define_artifacts {

+ 0 - 0
kokoro/release/linux/ruby/ruby_build.sh → kokoro/release/ruby/linux/ruby/ruby_build.sh


+ 0 - 0
kokoro/release/linux/ruby/ruby_build_environment.sh → kokoro/release/ruby/linux/ruby/ruby_build_environment.sh


+ 3 - 3
kokoro/release/macos/build_artifacts.sh → kokoro/release/ruby/macos/build_artifacts.sh

@@ -3,17 +3,17 @@
 set -ex
 set -ex
 
 
 # change to repo root
 # change to repo root
-cd $(dirname $0)/../../..
+cd $(dirname $0)/../../../..
 
 
 # all artifacts come here
 # all artifacts come here
 mkdir artifacts
 mkdir artifacts
 export ARTIFACT_DIR=$(pwd)/artifacts
 export ARTIFACT_DIR=$(pwd)/artifacts
 
 
 # ruby environment
 # 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
 gem install rubygems-update
 update_rubygems
 update_rubygems
 
 
 # build artifacts
 # build artifacts
-bash kokoro/release/macos/ruby/ruby_build.sh
+bash kokoro/release/ruby/macos/ruby/ruby_build.sh

+ 1 - 1
kokoro/release/macos/release.cfg → kokoro/release/ruby/macos/release.cfg

@@ -1,5 +1,5 @@
 # Configuration for Mac OSX release builds
 # 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 {
 action {
   define_artifacts {
   define_artifacts {

+ 0 - 0
kokoro/release/macos/ruby/ruby_build.sh → kokoro/release/ruby/macos/ruby/ruby_build.sh


+ 0 - 0
kokoro/release/macos/ruby/ruby_build_environment.sh → kokoro/release/ruby/macos/ruby/ruby_build_environment.sh