mirror of
https://github.com/VSCodium/vscodium.git
synced 2024-09-11 06:45:28 +03:00
Rename arm to armhf and re-enable RPMs
This commit is contained in:
parent
32583f3bd7
commit
c478ef85c2
4
.github/workflows/linux.yml
vendored
4
.github/workflows/linux.yml
vendored
@ -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
|
||||
|
||||
|
8
build.sh
8
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
|
||||
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user