From ffc53003abb068eaca0c4c77251b824e1e36c9d0 Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Tue, 11 Jul 2017 01:51:00 +0300 Subject: [PATCH 1/3] Fix Travis - bump libgit2 to 0.26 --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index b628059..185b179 100755 --- a/.travis.sh +++ b/.travis.sh @@ -2,7 +2,7 @@ cd ~ -git clone --depth=1 -b maint/v0.25 https://github.com/libgit2/libgit2.git +git clone --depth=1 -b maint/v0.26 https://github.com/libgit2/libgit2.git cd libgit2/ mkdir build && cd build From fa8c44263515c7d69c8e4aa646145f0b84390198 Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Tue, 11 Jul 2017 01:59:45 +0300 Subject: [PATCH 2/3] README.md Show build status for master Because it is default branch where all PRs are merged [skip ci] --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 9c5a277..f55dc1a 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ Gitless [![PyPI version](https://badge.fury.io/py/gitless.svg)]( http://badge.fury.io/py/gitless) [![homebrew](https://img.shields.io/homebrew/v/gitless.svg)](http://braumeister.org/formula/gitless) -[![Build Status](https://travis-ci.org/sdg-mit/gitless.svg?branch=develop)]( - https://travis-ci.org/sdg-mit/gitless) +[![Build Status](https://travis-ci.org/sdg-mit/gitless.svg?branch=master)](https://travis-ci.org/sdg-mit/gitless) [Gitless](http://gitless.com "Gitless's website") is an experimental version control system built on top of Git. Many From e71af312da7669f60a40fb6a9b30856cbe9f9be1 Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Tue, 11 Jul 2017 02:15:13 +0300 Subject: [PATCH 3/3] Fix AppVeyor - end2end tests need installed gl binary --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index c01c09f..27f2ef3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -33,6 +33,7 @@ before_test: test_script: - ps: | + &$env:PYTHON -m pip install . &$env:PYTHON setup.py nosetests --logging-level=WARN --with-xunit if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } # upload results to AppVeyor