Merge pull request #531 from stripedpajamas/fix-arm

Fix armhf and x64

.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
 

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
 

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"

create_appimage.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-if [[ "$VSCODE_ARCH" == "x64" ]]; then
-  # install a dep needed for this process
-  sudo apt-get install desktop-file-utils
-
-  cd ..
-  
-  bash -e src/resources/linux/appimage/pkg2appimage VSCodium-AppImage-Recipe.yml
-fi
+# if [[ "$VSCODE_ARCH" == "x64" ]]; then
+#   # install a dep needed for this process
+#   sudo apt-get install desktop-file-utils
+# 
+#   cd ..
+#   
+#   bash -e src/resources/linux/appimage/pkg2appimage VSCodium-AppImage-Recipe.yml
+# fi