diff options
author | 2017-05-16 10:18:38 -0700 | |
---|---|---|
committer | 2017-05-16 10:18:38 -0700 | |
commit | bc60bb25b2ee2950e6aa8689271e4f4bd13f74b3 (patch) | |
tree | 83b0635e9a15533914c069d41f7fe0fbf5f894d1 /tools/run_tests/artifacts/build_package_ruby.sh | |
parent | 928681dc3d3c738eb807b457ccd72627ac344dd3 (diff) | |
parent | 081c442462a21f326ff08f47ff1cd9a17c6746ea (diff) |
Merge remote-tracking branch 'upstream/master' into backward-compat-dev
Diffstat (limited to 'tools/run_tests/artifacts/build_package_ruby.sh')
-rwxr-xr-x | tools/run_tests/artifacts/build_package_ruby.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/artifacts/build_package_ruby.sh b/tools/run_tests/artifacts/build_package_ruby.sh index b4d20d8a4c..8388b84cc5 100755 --- a/tools/run_tests/artifacts/build_package_ruby.sh +++ b/tools/run_tests/artifacts/build_package_ruby.sh @@ -38,7 +38,7 @@ mkdir -p artifacts/ # All the ruby packages have been built in the artifact phase already # and we only collect them here to deliver them to the distribtest phase. -cp -r $EXTERNAL_GIT_ROOT/architecture={x86,x64},language=ruby,platform={windows,linux,macos}/artifacts/* artifacts/ || true +cp -r $EXTERNAL_GIT_ROOT/platform={windows,linux,macos}/artifacts/ruby_native_gem_*/* artifacts/ || true well_known_protos=( any api compiler/plugin descriptor duration empty field_mask source_context struct timestamp type wrappers ) @@ -56,7 +56,7 @@ for arch in {x86,x64}; do ;; esac for plat in {windows,linux,macos}; do - input_dir="$EXTERNAL_GIT_ROOT/architecture=$arch,language=protoc,platform=$plat/artifacts" + input_dir="$EXTERNAL_GIT_ROOT/platform=${plat}/artifacts/protoc_${plat}_${arch}" output_dir="$base/src/ruby/tools/bin/${ruby_arch}-${plat}" mkdir -p $output_dir/google/protobuf mkdir -p $output_dir/google/protobuf/compiler # needed for plugin.proto |