diff --git a/.travis-ci.sh b/.travis-ci.sh index 0409ceb5..95a79e96 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -16,7 +16,12 @@ DEBIAN_MIRROR="http://ftp.us.debian.org/debian" HOST_DEPENDENCIES="qemu-user-static binfmt-support debootstrap sbuild wget" # Debian package dependencies for the chrooted environment -GUEST_DEPENDENCIES="build-essential libcurl4-openssl-dev libsqlite3-dev libgnutls-openssl27 git" +GUEST_DEPENDENCIES="build-essential libcurl4-openssl-dev libsqlite3-dev libgnutls-openssl27 git libxml2" + +# LDC Version +# Different versions due to https://github.com/ldc-developers/ldc/issues/3027 +LDC_VERSION_ARMHF=1.13.0 +LDC_VERSION_ARM64=1.14.0 function setup_arm32_chroot { # Update apt repository details @@ -27,10 +32,10 @@ function setup_arm32_chroot { # Host dependencies sudo apt-get install -qq -y ${HOST_DEPENDENCIES} # Download LDC compiler - wget https://github.com/ldc-developers/ldc/releases/download/v1.11.0/ldc2-1.11.0-linux-armhf.tar.xz - tar -xf ldc2-1.11.0-linux-armhf.tar.xz - mv ldc2-1.11.0-linux-armhf dlang-${ARCH} - rm -rf ldc2-1.11.0-linux-armhf.tar.xz + wget https://github.com/ldc-developers/ldc/releases/download/v${LDC_VERSION_ARMHF}/ldc2-${LDC_VERSION_ARMHF}-linux-armhf.tar.xz + tar -xf ldc2-${LDC_VERSION_ARMHF}-linux-armhf.tar.xz + mv ldc2-${LDC_VERSION_ARMHF}-linux-armhf dlang-${ARCH} + rm -rf ldc2-${LDC_VERSION_ARMHF}-linux-armhf.tar.xz # Create chrooted environment sudo mkdir ${CHROOT_DIR} sudo debootstrap --foreign --no-check-gpg --variant=buildd --arch=${CHROOT_ARCH} ${VERSION} ${CHROOT_DIR} ${DEBIAN_MIRROR} @@ -49,10 +54,10 @@ function setup_arm64_chroot { # Host dependencies sudo apt-get install -qq -y ${HOST_DEPENDENCIES} # Download LDC compiler - wget https://github.com/ldc-developers/ldc/releases/download/v1.11.0/ldc2-1.11.0-linux-aarch64.tar.xz - tar -xf ldc2-1.11.0-linux-aarch64.tar.xz - mv ldc2-1.11.0-linux-aarch64 dlang-${ARCH} - rm -rf ldc2-1.11.0-linux-aarch64.tar.xz + wget https://github.com/ldc-developers/ldc/releases/download/v${LDC_VERSION_ARM64}/ldc2-${LDC_VERSION_ARM64}-linux-aarch64.tar.xz + tar -xf ldc2-${LDC_VERSION_ARM64}-linux-aarch64.tar.xz + mv ldc2-${LDC_VERSION_ARM64}-linux-aarch64 dlang-${ARCH} + rm -rf ldc2-${LDC_VERSION_ARM64}-linux-aarch64.tar.xz # ARM64 qemu-debootstrap needs to be 1.0.78, Trusty is 1.0.59 #sudo echo "deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" >> /etc/apt/sources.list diff --git a/README.md b/README.md index 82cfafe5..391a6f9a 100644 --- a/README.md +++ b/README.md @@ -122,8 +122,9 @@ sudo pacman -S libnotify ```text sudo apt-get install libcurl4-openssl-dev sudo apt-get install libsqlite3-dev -wget https://github.com/ldc-developers/ldc/releases/download/v1.11.0/ldc2-1.11.0-linux-armhf.tar.xz -tar -xvf ldc2-1.11.0-linux-armhf.tar.xz +sudo apt-get install libxml2 +wget https://github.com/ldc-developers/ldc/releases/download/v1.13.0/ldc2-1.13.0-linux-armhf.tar.xz +tar -xvf ldc2-1.13.0-linux-armhf.tar.xz ``` For notifications the following is necessary: ```text @@ -134,8 +135,9 @@ sudo apt install libnotify-dev ```text sudo apt-get install libcurl4-openssl-dev sudo apt-get install libsqlite3-dev -wget https://github.com/ldc-developers/ldc/releases/download/v1.11.0/ldc2-1.11.0-linux-aarch64.tar.xz -tar -xvf ldc2-1.11.0-linux-aarch64.tar.xz +sudo apt-get install libxml2 +wget https://github.com/ldc-developers/ldc/releases/download/v1.13.0/ldc2-1.13.0-linux-aarch64.tar.xz +tar -xvf ldc2-1.13.0-linux-aarch64.tar.xz ``` For notifications the following is necessary: ```text @@ -206,7 +208,7 @@ sudo make install ```text git clone https://github.com/abraunegg/onedrive.git cd onedrive -make DC=~/ldc2-1.11.0-linux-armhf/bin/ldmd2 +make DC=~/ldc2-1.13.0-linux-armhf/bin/ldmd2 sudo make install ``` @@ -214,7 +216,7 @@ sudo make install ```text git clone https://github.com/abraunegg/onedrive.git cd onedrive -make DC=~/ldc2-1.11.0-linux-aarch64/bin/ldmd2 +make DC=~/ldc2-1.13.0-linux-aarch64/bin/ldmd2 sudo make install ```