Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverting changes to ruby aarch64 build. #10394

Merged
merged 3 commits into from
Aug 11, 2022
Merged

Reverting changes to ruby aarch64 build. #10394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cfa509
Reverting changes to ruby aarch64 build.
mkruskal-google Aug 11, 2022
6000a08
Adding IN_DOCKER environment variable to prevent codegen
mkruskal-google Aug 11, 2022
88df109
Pass the cmake-built protoc to the ruby runner
mkruskal-google Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kokoro/linux/aarch64/test_ruby_aarch64.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
}
}