From c478ef85c2416abd0c43dc1b7d361433c992d7d2 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Thu, 8 Oct 2020 19:45:03 -0700
Subject: [PATCH] Rename arm to armhf and re-enable RPMs
---
.github/workflows/linux.yml | 4 ++--
build.sh | 8 ++------
check_tags.sh | 4 ++--
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 227fe5f..4089b48 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- vscode_arch: [x64, arm64, arm]
+ vscode_arch: [x64, arm64, armhf]
include:
- vscode_arch: x64
npm_arch: x64
@@ -27,7 +27,7 @@ jobs:
- vscode_arch: arm64
npm_arch: arm64
image: vscodium/vscodium-linux-build-agent:buster-arm64
- - vscode_arch: arm
+ - vscode_arch: armhf
npm_arch: armv7l
image: vscodium/vscodium-linux-build-agent:buster-armhf
diff --git a/build.sh b/build.sh
index 375a9f2..985a9ef 100755
--- a/build.sh
+++ b/build.sh
@@ -36,13 +36,9 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
yarn gulp "vscode-win32-${BUILDARCH}-system-setup"
yarn gulp "vscode-win32-${BUILDARCH}-user-setup"
else # linux
- yarn gulp vscode-linux-${VSCODE_ARCH}-min-ci
-
+ yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
-
- if [[ "$VSCODE_ARCH" == "x64" ]]; then
- yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
- fi
+ yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
. ../create_appimage.sh
fi
diff --git a/check_tags.sh b/check_tags.sh
index 7efa3c7..bc49b3d 100755
--- a/check_tags.sh
+++ b/check_tags.sh
@@ -29,9 +29,9 @@ if [ "$GITHUB_TOKEN" != "" ]; then
if [[ "$SHOULD_BUILD" != "yes" ]]; then
echo "Already have all the Linux arm64 builds"
fi
- elif [[ $VSCODE_ARCH == "arm" ]]; then
+ elif [[ $VSCODE_ARCH == "armhf" ]]; then
HAVE_ARM_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["armhf.deb"])')
- HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "arm-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
+ HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "armhf-$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"