Add hacky, initial arm64 support

This commit is contained in:
Dima Krasner
2019-12-09 21:40:37 +02:00
parent 2ea6d93325
commit 818097ca7e
4 changed files with 31 additions and 17 deletions

View File

@@ -4,6 +4,10 @@ matrix:
sudo: required sudo: required
env: BUILDARCH=x64 env: BUILDARCH=x64
dist: trusty dist: trusty
- os: linux
sudo: required
env: BUILDARCH=arm64
dist: trusty
- os: osx - os: osx
language: node_js language: node_js

View File

@@ -2,8 +2,8 @@
function keep_alive() { function keep_alive() {
while true; do while true; do
date echo .
sleep 60 read -t 60 < /proc/self/fd/1 > /dev/null 2>&1
done done
} }
@@ -66,14 +66,14 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
fi fi
yarn gulp compile-build
yarn gulp compile-extensions-build
# this task is very slow on mac, so using a keep alive to keep travis alive # this task is very slow on mac, so using a keep alive to keep travis alive
keep_alive & keep_alive &
KA_PID=$! KA_PID=$!
yarn gulp compile-build
yarn gulp compile-extensions-build
yarn gulp minify-vscode yarn gulp minify-vscode
kill $KA_PID
yarn gulp minify-vscode-reh yarn gulp minify-vscode-reh
yarn gulp minify-vscode-reh-web yarn gulp minify-vscode-reh-web
@@ -94,14 +94,18 @@ 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-x64-min-ci yarn gulp vscode-linux-${BUILDARCH}-min-ci
yarn gulp vscode-reh-linux-x64-min-ci yarn gulp vscode-reh-linux-${BUILDARCH}-min-ci
yarn gulp vscode-reh-web-linux-x64-min-ci yarn gulp vscode-reh-web-linux-${BUILDARCH}-min-ci
yarn gulp "vscode-linux-${BUILDARCH}-build-deb" yarn gulp "vscode-linux-${BUILDARCH}-build-deb"
yarn gulp "vscode-linux-${BUILDARCH}-build-rpm" if [[ "$BUILDARCH" != "arm64" ]]; then
yarn gulp "vscode-linux-${BUILDARCH}-build-rpm"
fi
. ../create_appimage.sh . ../create_appimage.sh
fi fi
kill $KA_PID
cd .. cd ..
fi fi

View File

@@ -5,18 +5,24 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install jq zip brew install jq zip
else else
sudo apt-get update sudo apt-get update
sudo apt-get install -y fakeroot rpm jq sudo apt-get install -y fakeroot jq
if [[ $BUILDARCH == "arm64" ]]; then if [[ $BUILDARCH == "arm64" ]]; then
echo "deb http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/arm64.list >/dev/null sed 's/^deb /deb [arch=amd64] '/g -i /etc/apt/sources.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/arm64.list >/dev/null
sudo dpkg --add-architecture arm64 sudo dpkg --add-architecture arm64
sudo apt-get update sudo apt-get update
sudo apt-get install libc6-dev-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu sudo apt-get install libc6-dev-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu `apt-cache search x11proto | grep ^x11proto | cut -f 1 -d ' '` xz-utils pkg-config
sudo apt-get install libx11-dev:arm64 libxkbfile-dev:arm64 mkdir -p dl
cd dl
apt-get download libx11-dev:arm64 libx11-6:arm64 libxkbfile-dev:arm64 libxkbfile1:arm64 libxau-dev:arm64 libxdmcp-dev:arm64 libxcb1-dev:arm64 libsecret-1-dev:arm64 libsecret-1-0:arm64 libpthread-stubs0-dev:arm64 libglib2.0-dev:arm64 libglib2.0-0:arm64 libffi-dev:arm64 libffi6:arm64 zlib1g:arm64 libpcre3-dev:arm64 libpcre3:arm64
for i in *.deb; do ar x $i; sudo tar -C / -xf data.tar.*; rm -f data.tar.*; done
cd ..
export CC=/usr/bin/aarch64-linux-gnu-gcc export CC=/usr/bin/aarch64-linux-gnu-gcc
export CXX=/usr/bin/aarch64-linux-gnu-g++ export CXX=/usr/bin/aarch64-linux-gnu-g++
export CC_host=/usr/bin/gcc export CC_host=/usr/bin/gcc
export CXX_host=/usr/bin/g++ export CXX_host=/usr/bin/g++
export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
else else
sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev rpm
fi fi
fi fi

4
sum.sh
View File

@@ -28,8 +28,8 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
sum_file VSCodium-win32-*.zip sum_file VSCodium-win32-*.zip
else # linux else # linux
cp out/*.AppImage . cp out/*.AppImage .
cp vscode/.build/linux/deb/amd64/deb/*.deb . cp vscode/.build/linux/deb/*/deb/*.deb .
cp vscode/.build/linux/rpm/x86_64/*.rpm . cp vscode/.build/linux/rpm/*/*.rpm .
sum_file *.AppImage sum_file *.AppImage
sum_file VSCodium-linux*.tar.gz sum_file VSCodium-linux*.tar.gz