Skip to content

chore: retry docker run, instead of commands in build.sh #72

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

Merged
kalyanac merged 1 commit into from
Jun 25, 2019
Merged

chore: retry docker run, instead of commands in build.sh #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions tools/build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,17 @@ set -e pipefail
# Display commands
set -x

retry() {
"${@}" || "${@}" || "${@}" || exit $?
}

cd $(dirname $0)/../..
BASE_DIR=$PWD

ARTIFACTS_OUT="${BASE_DIR}/artifacts"
mkdir -p "$ARTIFACTS_OUT"

retry npm install
npm install

for version in 6.0.0 8.0.0 10.0.0 11.0.0 12.0.0
do
retry ./node_modules/.bin/node-pre-gyp configure rebuild package \
./node_modules/.bin/node-pre-gyp configure rebuild package \
--target=$version --target_arch="x64"
cp -r build/stage/* "${ARTIFACTS_OUT}/"
rm -rf build
Expand Down
4 changes: 2 additions & 2 deletions tools/build/linux_build_and_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ cd $(dirname $0)/../..
BASE_DIR=$PWD

retry docker build -t build-linux -f tools/build/Dockerfile.linux tools/build
docker run -v "${BASE_DIR}":"${BASE_DIR}" build-linux \
retry docker run -v "${BASE_DIR}":"${BASE_DIR}" build-linux \
"${BASE_DIR}/tools/build/build.sh"

retry docker build -t build-alpine -f tools/build/Dockerfile.alpine tools/build
docker run -v "${BASE_DIR}":"${BASE_DIR}" build-alpine \
retry docker run -v "${BASE_DIR}":"${BASE_DIR}" build-alpine \
"${BASE_DIR}/tools/build/build.sh"

GCS_LOCATION="cprof-e2e-nodejs-artifacts/pprof-nodejs/kokoro/${BUILD_TYPE}/${KOKORO_BUILD_NUMBER}"
Expand Down