Skip to content

Commit

Permalink
Reverting changes to ruby aarch64 build. (#10394)
Browse files Browse the repository at this point in the history
* Reverting changes to ruby aarch64 build.

* Adding IN_DOCKER environment variable to prevent codegen

* Pass the cmake-built protoc to the ruby runner
  • Loading branch information
mkruskal-google authored and MaHeyndrickx committed Aug 12, 2022
1 parent f36b3c2 commit 4c3ab6c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 35 deletions.
2 changes: 1 addition & 1 deletion kokoro/linux/aarch64/test_ruby_aarch64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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,
# 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
16 changes: 16 additions & 0 deletions kokoro/linux/ruby_aarch64/build.sh
Original file line number Diff line number Diff line change
@@ -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
19 changes: 2 additions & 17 deletions kokoro/linux/ruby_aarch64/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
# Config file for running tests in Kokoro

# 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

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 {
define_artifacts {
regex: "**/sponge_log.*"
regex: "**/sponge_log.xml"
}
}
19 changes: 2 additions & 17 deletions kokoro/linux/ruby_aarch64/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
# Config file for running tests in Kokoro

# 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

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 {
define_artifacts {
regex: "**/sponge_log.*"
regex: "**/sponge_log.xml"
}
}

0 comments on commit 4c3ab6c

Please sign in to comment.