Reverting changes to ruby aarch64 build. (#10394)

* Reverting changes to ruby aarch64 build.

* Adding IN_DOCKER environment variable to prevent codegen

* Pass the cmake-built protoc to the ruby runner
pull/10385/head
Mike Kruskal 2 years ago committed by mheyndrickx
parent f36b3c286b
commit 4c3ab6ca00
  1. 2
      kokoro/linux/aarch64/test_ruby_aarch64.sh
  2. 16
      kokoro/linux/ruby_aarch64/build.sh
  3. 19
      kokoro/linux/ruby_aarch64/continuous.cfg
  4. 19
      kokoro/linux/ruby_aarch64/presubmit.cfg

@ -24,4 +24,4 @@ kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh ko
# otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity, # otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
# we just run map the user's home to a throwaway temporary directory # we just run map the user's home to a throwaway temporary directory
docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work arm64v8/ruby:2.7.3-buster kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -e "PROTOC=/work/protoc" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work arm64v8/ruby:2.7.3-buster kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh

@ -0,0 +1,16 @@
#!/bin/bash
#
# This is the top-level script we give to Kokoro as the entry point for
# running the "continuous" and "presubmit" jobs.
set -ex
# Change to repo root
cd $(dirname $0)/../../..
# Initialize any submodules.
git submodule update --init --recursive
kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
kokoro/linux/aarch64/test_ruby_aarch64.sh

@ -1,26 +1,11 @@
# Config file for running tests in Kokoro # Config file for running tests in Kokoro
# Location of the build script in repository # Location of the build script in repository
build_file: "protobuf/kokoro/linux/bazel.sh" build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
timeout_mins: 120 timeout_mins: 120
env_vars {
key: "CONTAINER_IMAGE"
value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
}
env_vars {
key: "BAZEL_TARGETS"
value: "//ruby/..."
}
env_vars {
key: "BAZEL_EXTRA_FLAGS"
value: "--define=ruby_platform=c"
}
action { action {
define_artifacts { define_artifacts {
regex: "**/sponge_log.*" regex: "**/sponge_log.xml"
} }
} }

@ -1,26 +1,11 @@
# Config file for running tests in Kokoro # Config file for running tests in Kokoro
# Location of the build script in repository # Location of the build script in repository
build_file: "protobuf/kokoro/linux/bazel.sh" build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
timeout_mins: 120 timeout_mins: 120
env_vars {
key: "CONTAINER_IMAGE"
value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f"
}
env_vars {
key: "BAZEL_TARGETS"
value: "//ruby/..."
}
env_vars {
key: "BAZEL_EXTRA_FLAGS"
value: "--define=ruby_platform=c"
}
action { action {
define_artifacts { define_artifacts {
regex: "**/sponge_log.*" regex: "**/sponge_log.xml"
} }
} }

Loading…
Cancel
Save