From d91206eed678cb6a0d6d0091673d3d4f1a7c2d1b Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Tue, 20 Dec 2016 13:18:39 +0800 Subject: [PATCH] CI: remove glib from Travis & Appveyor setup --- .appveyor.yml | 4 ++-- .travis.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index dc41ecbb..0c36f5da 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,8 @@ # Appveyor configuration file for CI build of Unicorn Engine on Windows (under Cygwin) environment: CYG_MIRROR: http://cygwin.mirror.constant.com - CYG_PACKAGES: make,gcc-core,clang,pkg-config,libpcre-devel,libglib2.0-devel,cmake,python-setuptools,ruby,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core - MSYS_PACKAGES: mingw-w64-x86_64-glib2 mingw-w64-i686-glib2 cmake + CYG_PACKAGES: make,gcc-core,clang,pkg-config,libpcre-devel,cmake,python-setuptools,ruby,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core + MSYS_PACKAGES: cmake matrix: - MSYSTEM: MINGW64 BASH: C:\msys64\usr\bin\bash diff --git a/.travis.yml b/.travis.yml index 543cbb42..83b7bb8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: c sudo: false before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" && "$MACOS_UNIVERSAL" != "yes" ]]; then brew install glib cmocka; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" && "$MACOS_UNIVERSAL" == "yes" ]]; then brew install glib --universal cmocka; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" && "$MACOS_UNIVERSAL" != "yes" ]]; then brew install cmocka; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" && "$MACOS_UNIVERSAL" == "yes" ]]; then brew install --universal cmocka; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./install-cmocka-linux.sh; fi script: - make && make -C bindings/go && make -C bindings/go test && make test