From d9a624cc48db545fc118a515610b8fd3777ebe1d Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Thu, 24 Aug 2017 18:35:54 -0400 Subject: [PATCH] ci: disable integration tests on 'next' branch of git --- .travis.yml | 11 ----------- circle.yml | 3 --- 2 files changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 868f52bc..0064f33b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ env: - GIT_SOURCE_REPO="https://github.com/git/git.git" - GIT_EARLIEST_SUPPORTED_VERSION="v2.0.0 - GIT_LATEST_SOURCE_BRANCH="master" - - GIT_NEXT_SOURCE_BRANCH="next" - GIT_ASKPASS="" matrix: @@ -28,16 +27,6 @@ matrix: make --jobs=2; make install; cd ..; - - env: git-latest-next-from-source - os: linux - before_script: - - > - git clone $GIT_SOURCE_REPO git-source; - cd git-source; - git checkout $GIT_NEXT_SOURCE_BRANCH; - make --jobs=2; - make install; - cd ..; - env: git-earliest-supported-version-from-source os: linux before_script: diff --git a/circle.yml b/circle.yml index fa9dcac4..4f79fc5c 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,6 @@ machine: GIT_SOURCE_REPO: https://github.com/git/git.git GIT_EARLIEST_SUPPORTED_VERSION: v2.0.0 GIT_LATEST_SOURCE_BRANCH: master - GIT_NEXT_SOURCE_BRANCH: next XCODE_SCHEME: test XCODE_WORKSPACE: test XCODE_PROJECT: test @@ -45,5 +44,3 @@ test: - PATH="$HOME/bin:$PATH" SKIPCOMPILE=1 script/integration - script/install-git-source "$GIT_LATEST_SOURCE_BRANCH" - PATH="$HOME/bin:$PATH" SKIPCOMPILE=1 script/integration - - script/install-git-source "$GIT_NEXT_SOURCE_BRANCH" - - PATH="$HOME/bin:$PATH" SKIPCOMPILE=1 script/integration