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

Jump to bottom

Prebuilt binaries for s390x #1230

Merged
merged 10 commits into from Jan 24, 2020
Merged

Prebuilt binaries for s390x #1230

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ad2273
Create build_artifact_node_s390x.sh
shahidhs-ibm Dec 26, 2019
4d1e4c9
Update build_all_linux_artifacts.sh
shahidhs-ibm Dec 26, 2019
ec00932
Update Dockerfile
shahidhs-ibm Dec 26, 2019
a92005a
Update build_all_linux_artifacts.sh
shahidhs-ibm Jan 2, 2020
da545c9
Update build_artifact_node_s390x.sh
shahidhs-ibm Jan 2, 2020
a69cb45
Update build_all_linux_artifacts.sh
shahidhs-ibm Jan 3, 2020
e11587c
Incorporating review comments
shahidhs-ibm Jan 8, 2020
01a1684
Make build_artifact_node_s390x.sh executable.
Jan 9, 2020
ec30a63
Revert "Make build_artifact_node_s390x.sh executable."
shahidhs-ibm Jan 9, 2020
43d7bc7
Make build_artifact_node_s390x.sh executable.
shahidhs-ibm Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/grpc-native-core/tools/run_tests/artifacts/build_all_linux_artifacts.sh
View file
Open in desktop
Expand Up @@ -69,8 +69,13 @@ if [ "$DO_NATIVE" = "true" ] ; then
fi

if [ "$DO_CROSS" = "true" ] ; then
docker build -t alpine_node_artifact $base_dir/tools/docker/alpine_artifact
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why move this line up here?


# Cross build for arm
$tool_dir/build_artifact_node_arm.sh
docker run -e JOBS=8 -e ARTIFACTS_OUT=/var/grpc/artifacts -v $base_dir:/var/grpc alpine_node_artifact /var/grpc/tools/run_tests/artifacts/build_artifact_node.sh --with-alpine
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line appears to be redundant with line 80.


docker build -t alpine_node_artifact $base_dir/tools/docker/alpine_artifact
# Cross build for s390x
$tool_dir/build_artifact_node_s390x.sh
docker run -e JOBS=8 -e ARTIFACTS_OUT=/var/grpc/artifacts -v $base_dir:/var/grpc alpine_node_artifact /var/grpc/tools/run_tests/artifacts/build_artifact_node.sh --with-alpine
fi
24 changes: 24 additions & 0 deletions packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_s390x.sh
View file
Open in desktop
@@ -0,0 +1,24 @@
#!/bin/bash

set -ex

# https://github.com/mapbox/node-pre-gyp/issues/362
npm install -g node-gyp

cd $(dirname $0)/../../..

rm -rf build || true

mkdir -p "${ARTIFACTS_OUT}"

npm update

node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 12.0.0 13.0.0 )

for version in ${node_versions[@]}
do
# Cross compile for s390x on x64
# Requires debian or ubuntu packages "g++-s390x-linux-gnu".
CC=s390x-linux-gnu-gcc CXX=s390x-linux-gnu-g++ LD=s390x-linux-gnu-g++ ./node_modules/.bin/node-pre-gyp configure rebuild package testpackage --target=$version --target_arch=s390x
cp -r build/stage/* "${ARTIFACTS_OUT}"/
done
2 changes: 1 addition & 1 deletion tools/release/cross/Dockerfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ FROM debian:stretch

RUN dpkg --add-architecture i386
RUN apt-get update
RUN apt-get install -y curl build-essential g++-aarch64-linux-gnu g++-arm-linux-gnueabihf python libc6-dev:i386 lib32stdc++-6-dev
RUN apt-get install -y curl build-essential g++-aarch64-linux-gnu g++-arm-linux-gnueabihf g++-s390x-linux-gnu python libc6-dev:i386 lib32stdc++-6-dev
RUN curl -fsSL get.docker.com | bash

RUN mkdir /usr/local/nvm
Expand Down