mirror of https://git.tuxpa.in/a/code-server.git
Fix arm builds
This commit is contained in:
parent
11fdb8854b
commit
4a65b58772
|
@ -47,6 +47,8 @@ deploy:
|
||||||
local_dir: release-upload
|
local_dir: release-upload
|
||||||
on:
|
on:
|
||||||
tags: true
|
tags: true
|
||||||
|
# TODO: The gcs provider fails to install on arm64.
|
||||||
|
condition: $TRAVIS_CPU_ARCH = amd64
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
timeout: 600
|
timeout: 600
|
||||||
|
|
|
@ -5,9 +5,22 @@ set -euo pipefail
|
||||||
main() {
|
main() {
|
||||||
cd "$(dirname "$0")/../.."
|
cd "$(dirname "$0")/../.."
|
||||||
|
|
||||||
|
# This, strangely enough, fixes the arm build being terminated for not having
|
||||||
|
# output on Travis. It's as if output is buffered and only displayed once a
|
||||||
|
# certain amount is collected. Five seconds didn't work but one second seems
|
||||||
|
# to generate enough output to make it work.
|
||||||
|
local pid
|
||||||
|
while true; do
|
||||||
|
echo 'Still running...'
|
||||||
|
sleep 1
|
||||||
|
done &
|
||||||
|
pid=$!
|
||||||
|
|
||||||
docker build ci/image
|
docker build ci/image
|
||||||
imageTag="$(docker build -q ci/image)"
|
imageTag="$(docker build -q ci/image)"
|
||||||
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" "$*"
|
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" "$*"
|
||||||
|
|
||||||
|
kill $pid
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|
|
@ -17,7 +17,7 @@ function package() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local arch
|
local arch
|
||||||
arch="$(uname -m)"
|
arch=$(uname -m | sed 's/aarch/arm/')
|
||||||
|
|
||||||
echo -n "Creating release..."
|
echo -n "Creating release..."
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue