Skip to content

Commit 4a65b58

Browse files
committed
Fix arm builds
1 parent 11fdb88 commit 4a65b58

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ deploy:
4747
local_dir: release-upload
4848
on:
4949
tags: true
50+
# TODO: The gcs provider fails to install on arm64.
51+
condition: $TRAVIS_CPU_ARCH = amd64
5052

5153
cache:
5254
timeout: 600

ci/image/run.sh

+13
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ set -euo pipefail
55
main() {
66
cd "$(dirname "$0")/../.."
77

8+
# This, strangely enough, fixes the arm build being terminated for not having
9+
# output on Travis. It's as if output is buffered and only displayed once a
10+
# certain amount is collected. Five seconds didn't work but one second seems
11+
# to generate enough output to make it work.
12+
local pid
13+
while true; do
14+
echo 'Still running...'
15+
sleep 1
16+
done &
17+
pid=$!
18+
819
docker build ci/image
920
imageTag="$(docker build -q ci/image)"
1021
docker run -t --rm -e CI -e GITHUB_TOKEN -e TRAVIS_TAG -v "$(yarn cache dir):/usr/local/share/.cache/yarn/v6" -v "$PWD:/repo" -w /repo "$imageTag" "$*"
22+
23+
kill $pid
1124
}
1225

1326
main "$@"

ci/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function package() {
1717
fi
1818

1919
local arch
20-
arch="$(uname -m)"
20+
arch=$(uname -m | sed 's/aarch/arm/')
2121

2222
echo -n "Creating release..."
2323

0 commit comments

Comments
 (0)