From 3ef2fe71e6def02602181f8ddf7ff3ad3a29f9bb Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 21 Oct 2019 09:39:28 -0700 Subject: [PATCH] travis-ci reorg and disable win hide the CI junk, and disable incomplete windows build --- travis-inspect.sh => .ci-local/travis-inspect.sh | 0 travis-libevent.sh => .ci-local/travis-libevent.sh | 0 withenv.sh => .ci-local/withenv.sh | 0 .travis.yml | 12 ++++++------ 4 files changed, 6 insertions(+), 6 deletions(-) rename travis-inspect.sh => .ci-local/travis-inspect.sh (100%) rename travis-libevent.sh => .ci-local/travis-libevent.sh (100%) rename withenv.sh => .ci-local/withenv.sh (100%) diff --git a/travis-inspect.sh b/.ci-local/travis-inspect.sh similarity index 100% rename from travis-inspect.sh rename to .ci-local/travis-inspect.sh diff --git a/travis-libevent.sh b/.ci-local/travis-libevent.sh similarity index 100% rename from travis-libevent.sh rename to .ci-local/travis-libevent.sh diff --git a/withenv.sh b/.ci-local/withenv.sh similarity index 100% rename from withenv.sh rename to .ci-local/withenv.sh diff --git a/.travis.yml b/.travis.yml index c7ec04b..5972196 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,12 +17,12 @@ addons: - cmake install: - - ./withenv.sh ./.ci/travis-prepare.sh - - ./travis-libevent.sh + - ./.ci-local/withenv.sh ./.ci/travis-prepare.sh + - ./.ci-local/travis-libevent.sh script: - - ./travis-inspect.sh - - ./withenv.sh ./.ci/travis-build.sh + - ./.ci-local/travis-inspect.sh + - ./.ci-local/withenv.sh ./.ci/travis-build.sh # If you need to do more during install and build, # add a local directory to your module and do e.g. @@ -38,8 +38,8 @@ script: matrix: include: - - env: BASE=7.0 EPICS_HOST_ARCH=win32-x86 - os: windows +# - env: BASE=7.0 EPICS_HOST_ARCH=win32-x86 +# os: windows # Different configurations of default gcc and clang