From 083a1749eefbc4fc8d31601a1b8446a897fbe7be Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 19 Nov 2018 07:51:58 -0800 Subject: [PATCH] CI Cleanup (#1042) * Improve homebrew * remove msys cache has ballooned out of control, now hurting build times * re-add msys cache and clean unused pkgs should prevent ballooning * move cc --- .appveyor.yml | 2 +- .travis.yml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6b04bbed..397c9880 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -41,7 +41,7 @@ install: - ps: if (Test-Path Env:\CYG_ROOT) { Start-FileDownload "https://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP" } - if defined CYG_ROOT (%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%" --upgrade-also) - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm ${MSYS_PACKAGES}") - - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm ${MSYS_PACKAGES}") + - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm ${MSYS_PACKAGES} && pacman -Sc --noconfirm") build_script: - if defined BASH (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && make") - if "%MSYSTEM%" == "MINGW64" (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && make -C bindings/go") diff --git a/.travis.yml b/.travis.yml index df04608b..c0d688c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: c sudo: false before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew bundle; 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 @@ -25,6 +24,5 @@ matrix: - os: osx script: brew install --HEAD unicorn && brew test unicorn addons: - apt: - packages: - # mingw-w64 packages too old in precise + homebrew: + brewfile: true