timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-24 03:50:13 +10:00
Code Issues Packages Projects Releases Wiki Activity

Rename arm to armhf and re-enable RPMs

Browse Source
This commit is contained in:
Peter Squicciarini
2020-10-08 19:45:03 -07:00
parent 32583f3bd7
commit c478ef85c2
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/linux.yml vendored
View File

@@ -19,7 +19,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
vscode_arch: [x64, arm64, arm] vscode_arch: [x64, arm64, armhf]
include: include:
- vscode_arch: x64 - vscode_arch: x64
npm_arch: x64 npm_arch: x64
@@ -27,7 +27,7 @@ jobs:
- vscode_arch: arm64 - vscode_arch: arm64
npm_arch: arm64 npm_arch: arm64
image: vscodium/vscodium-linux-build-agent:buster-arm64 image: vscodium/vscodium-linux-build-agent:buster-arm64
- vscode_arch: arm - vscode_arch: armhf
npm_arch: armv7l npm_arch: armv7l
image: vscodium/vscodium-linux-build-agent:buster-armhf image: vscodium/vscodium-linux-build-agent:buster-armhf

8
build.sh
View File

@@ -36,13 +36,9 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
yarn gulp "vscode-win32-${BUILDARCH}-system-setup" yarn gulp "vscode-win32-${BUILDARCH}-system-setup"
yarn gulp "vscode-win32-${BUILDARCH}-user-setup" yarn gulp "vscode-win32-${BUILDARCH}-user-setup"
else # linux 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" yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
if [[ "$VSCODE_ARCH" == "x64" ]]; then
yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
fi
. ../create_appimage.sh . ../create_appimage.sh
fi fi

4
check_tags.sh
View File

@@ -29,9 +29,9 @@ if [ "$GITHUB_TOKEN" != "" ]; then
if [[ "$SHOULD_BUILD" != "yes" ]]; then if [[ "$SHOULD_BUILD" != "yes" ]]; then
echo "Already have all the Linux arm64 builds" echo "Already have all the Linux arm64 builds"
fi 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_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 if [[ "$HAVE_ARM_DEB" != "true" ]]; then
echo "Building on Linux arm because we have no DEB" echo "Building on Linux arm because we have no DEB"
export SHOULD_BUILD="yes" export SHOULD_BUILD="yes"