From 430d6ab06d6ecaf66eb08c7d39a81f3a8f8103e0 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 29 May 2020 12:42:07 -0700 Subject: Update LDC Version to 1.21.0, remove py27 logic, add rpm install --- .travis/install.sh | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 64a300b..597af4c 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -19,6 +19,9 @@ else sudo ln -s /usr/local/clang-5.0.0/bin/clang++ /usr/bin/clang++ fi + # dependencies for rpm packaging tests + sudo apt-get -y install rpm + # dependencies for gdc tests sudo apt-get -y install gdc @@ -42,17 +45,11 @@ else sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin # dependencies for ldc tests - wget https://github.com/ldc-developers/ldc/releases/download/v1.15.0/ldc2-1.15.0-linux-x86_64.tar.xz - tar xf ldc2-1.15.0-linux-x86_64.tar.xz - sudo cp -rf ldc2-1.15.0-linux-x86_64/* / - - ls -l /usr/lib/*python*{so,a}* - - # For now skip swig if py27 - if [[ "$PYVER" == 27 ]]; then - # dependencies for swig tests - wget https://github.com/swig/swig/archive/rel-3.0.12.tar.gz - tar xzf rel-3.0.12.tar.gz - cd swig-rel-3.0.12 && ./autogen.sh && ./configure --prefix=/usr && make && sudo make install && cd .. - fi + export SCONS_LDC_VERSION=1.21.0 + wget https://github.com/ldc-developers/ldc/releases/download/v${SCONS_LDC_VERSION}/ldc2-${SCONS_LDC_VERSION}-linux-x86_64.tar.xz +# wget https://github.com/ldc-developers/ldc/releases/download/v1.15.0/ldc2-1.15.0-linux-x86_64.tar.xz + tar xf ldc2-${SCONS_LDC_VERSION}-linux-x86_64.tar.xz + sudo cp -rf ldc2-${SCONS_LDC_VERSION}-linux-x86_64/* / + + ls -l /usr/lib*/*python*{so,a}* fi -- cgit v0.12