Compare commits

...

5 Commits

Author SHA1 Message Date
Peter Squicciarini
c440844e99 Update check_tags.sh
Fixes armhf tag check
2019-12-20 19:52:01 -08:00
Peter Squicciarini
26a5bfcab8 Merge pull request #310 from stripedpajamas/fix-builds
OS specific keep alive funcs
2019-12-20 15:59:30 -08:00
Peter Squicciarini
e379b37110 OS specific keep alive funcs 2019-12-20 14:20:10 -08:00
Peter Squicciarini
4612db050a Merge pull request #278 from mztriz/patch-1
Use cd ... || exit in case cd fails.
2019-12-19 22:08:09 -08:00
Ava Barron
df742b9ee9 Use cd ... || exit in case cd fails. 2019-11-05 22:45:46 -05:00
2 changed files with 17 additions and 5 deletions

View File

@@ -1,19 +1,26 @@
#!/bin/bash
function keep_alive() {
function keep_alive_small() {
while true; do
echo .
read -t 60 < /proc/self/fd/1 > /dev/null 2>&1
done
}
function keep_alive() {
while true; do
date
sleep 60
done
}
if [[ "$SHOULD_BUILD" == "yes" ]]; then
export BUILD_SOURCEVERSION=$LATEST_MS_COMMIT
echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
echo "BUILD_SOURCEVERSION: ${BUILD_SOURCEVERSION}"
cp -rp src/* vscode/
cd vscode
cd vscode || exit
export npm_config_arch="$BUILDARCH"
export npm_config_target_arch="$BUILDARCH"
@@ -69,8 +76,13 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
fi
# this task is very slow on mac, so using a keep alive to keep travis alive
keep_alive &
# these tasks are very slow, so using a keep alive to keep travis alive
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
keep_alive_small &
else
keep_alive &
fi
KA_PID=$!
yarn gulp compile-build

View File

@@ -36,7 +36,7 @@ if [ "$GITHUB_TOKEN" != "" ]; then
fi
elif [[ $BUILDARCH == "arm" ]]; then
HAVE_ARM_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["armhf.deb"])')
HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "armhf-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "arm-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
if [[ "$HAVE_ARM_DEB" != "true" ]]; then
echo "Building on Linux arm because we have no DEB"
export SHOULD_BUILD="yes"