[pkg-d-commits] [ldc] 19/95: CI is not handling libconfig anymore

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.3.0-beta1
in repository ldc.

commit 172eb30c1069e3c2f35238c31c392ac86e559d8b
Author: Remi THEBAULT <remi.thebault at gmail.com>
Date:   Fri Feb 24 23:31:25 2017 +0100

    CI is not handling libconfig anymore
---
 .travis.yml  |  3 +--
 appveyor.yml | 13 ++-----------
 circle.yml   |  4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1b89c88..503861a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,6 @@ addons:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - libconfig++8-dev
     - gdb
     - gcc-4.9
     - g++-4.9
@@ -71,7 +70,7 @@ before_install:
     export LLVM_CONFIG="llvm-$LLVM_VERSION/bin/llvm-config";
 install:
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export CC="gcc-4.9"; export CXX="g++-4.9"; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update; brew install libconfig; fi;
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update; fi;
   - eval "${DC} --version"
   - pip install --user lit
   - python -c "import lit; lit.main();" --version | head -n 1
diff --git a/appveyor.yml b/appveyor.yml
index aa19a17..b10deaf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,11 +36,6 @@ install:
   - cd ldc
   - git submodule update --init --recursive
   - cd ..
-  # Clone libconfig (v1.6 does not work due to https://github.com/hyperrealm/libconfig/issues/47)
-  - git clone https://github.com/hyperrealm/libconfig.git libconfig
-  - cd libconfig
-  - git checkout 7585cf6
-  - cd ..
   # Download & extract libcurl
   - appveyor DownloadFile "http://d.darktech.org/libcurl-7.48.0-WinSSL-zlib-x86-x64.zip" -FileName libcurl.zip
   - md libcurl
@@ -118,18 +113,14 @@ install:
 #---------------------------------#
 
 before_build:
-  - cd c:\projects
-  # Build libconfig
-  - if "%APPVEYOR_JOB_ARCH%"=="x64" ( msbuild libconfig\lib\libconfig.vcxproj /p:Configuration=ReleaseStatic /p:Platform=x64 )
-  - if "%APPVEYOR_JOB_ARCH%"=="x86" ( msbuild libconfig\lib\libconfig.vcxproj /p:Configuration=ReleaseStatic /p:Platform=Win32 )
 
 build_script:
   - cd c:\projects
   # Generate build files for LDC
   - md ninja-ldc
   - cd ninja-ldc
-  - if "%APPVEYOR_JOB_ARCH%"=="x64" ( cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=c:\projects\ldc-x64 -DLLVM_ROOT_DIR=c:/projects/llvm-x64 -DLIBCONFIG_INCLUDE_DIR=c:/projects/libconfig/lib -DLIBCONFIG_LIBRARY=c:/projects/libconfig/lib/x64/ReleaseStatic/libconfig.lib ..\ldc )
-  - if "%APPVEYOR_JOB_ARCH%"=="x86" ( cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=c:\projects\ldc-x86 -DLLVM_ROOT_DIR=c:/projects/llvm-x86 -DLIBCONFIG_INCLUDE_DIR=c:/projects/libconfig/lib -DLIBCONFIG_LIBRARY=c:/projects/libconfig/lib/ReleaseStatic/libconfig.lib ..\ldc )
+  - if "%APPVEYOR_JOB_ARCH%"=="x64" ( cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=c:\projects\ldc-x64 -DLLVM_ROOT_DIR=c:/projects/llvm-x64 ..\ldc )
+  - if "%APPVEYOR_JOB_ARCH%"=="x86" ( cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=c:\projects\ldc-x86 -DLLVM_ROOT_DIR=c:/projects/llvm-x86 ..\ldc )
   # Build LDC, druntime and phobos
   - ninja -j2
 
diff --git a/circle.yml b/circle.yml
index c94d47d..27ad564 100644
--- a/circle.yml
+++ b/circle.yml
@@ -26,7 +26,7 @@ dependencies:
 
   override:
     - sudo apt-get remove clang llvm
-    - sudo apt-get install libconfig++8-dev libedit-dev
+    - sudo apt-get install libedit-dev
     - sudo apt-get install llvm-4.0 llvm-4.0-dev clang-4.0
     - pip install --user lit
   post:
@@ -75,7 +75,7 @@ test:
 # The containers were started but only the tests from container 0 were run.
 # Containers 1-3 also started the tests but stop with the message
 # "No tests were found!!!"
-#   
+#
 #    - ? |
 #        echo $CIRCLE_NODE_INDEX
 #        case $CIRCLE_NODE_INDEX in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git