From c98aab94a2a23605280a4dbd5517371a7caa39dd Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Wed, 24 Aug 2016 19:04:12 -0700 Subject: [PATCH 1/5] Add dependency check to travis Also uses the `--auto` shorthand --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0266d06..56413f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,8 @@ before_install: - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco pkg install --deps search-auto cover-coveralls; fi install: - - raco pkg install --deps search-auto lens-common/ lens-data/ lens-lib/ lens-unstable/ lens-doc/ lens/ + - raco pkg install --auto lens-common/ lens-data/ lens-lib/ lens-unstable/ lens-doc/ lens/ + - raco setup -p --check-pkg-deps lens-common lens-data lens-lib lens-unstable lens-doc lens script: - raco test -p lens-common lens-data lens-lib lens-unstable lens-doc lens From d9c899f829e699a55f199ab98b155963dc6b540e Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Wed, 24 Aug 2016 19:12:06 -0700 Subject: [PATCH 2/5] Fix pkgs flag usage --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56413f7..ee1ae64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_install: install: - raco pkg install --auto lens-common/ lens-data/ lens-lib/ lens-unstable/ lens-doc/ lens/ - - raco setup -p --check-pkg-deps lens-common lens-data lens-lib lens-unstable lens-doc lens + - raco setup --check-pkg-deps --pkgs lens-common lens-data lens-lib lens-unstable lens-doc lens script: - raco test -p lens-common lens-data lens-lib lens-unstable lens-doc lens From 640f496542e5d2d50825baf3a45d153371ff7ffb Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Wed, 24 Aug 2016 20:09:16 -0700 Subject: [PATCH 3/5] Don't use --check-pkg-deps flag in pre-6.1 --- .travis.yml | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee1ae64..c51e86e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,30 +5,19 @@ env: - RACKET_DIR=~/racket - VERSION_TO_COVER="6.5" matrix: - - RACKET_VERSION="6.0.1" - CATALOG_VERSION="6.0.1" - - RACKET_VERSION="6.1" - CATALOG_VERSION="6.1" - - RACKET_VERSION="6.1.1" - CATALOG_VERSION="6.1.1" - - RACKET_VERSION="6.2" - CATALOG_VERSION="6.2" - - RACKET_VERSION="6.2.1" - CATALOG_VERSION="6.2.1" - - RACKET_VERSION="6.3" - CATALOG_VERSION="6.3" - - RACKET_VERSION="6.4" - CATALOG_VERSION="6.4" - - RACKET_VERSION="6.5" - CATALOG_VERSION="6.5" - - RACKET_VERSION="6.6" - CATALOG_VERSION="6.6" - - RACKET_VERSION="HEAD" - CATALOG_VERSION="6.6" + - RACKET_VERSION="6.0.1" CATALOG_VERSION="6.0.1" + - RACKET_VERSION="6.1" CATALOG_VERSION="6.1" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="6.1.1" CATALOG_VERSION="6.1.1" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="6.2" CATALOG_VERSION="6.2" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="6.2.1" CATALOG_VERSION="6.2.1" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="6.3" CATALOG_VERSION="6.3" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="6.4" CATALOG_VERSION="6.4" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="6.5" CATALOG_VERSION="6.5" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="6.6" CATALOG_VERSION="6.6" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="HEAD" CATALOG_VERSION="6.6" CHECK_DEPS_FLAGS="--check-pkg-deps" matrix: allow_failures: - - env: RACKET_VERSION="HEAD" - CATALOG_VERSION="6.6" + - env: RACKET_VERSION="HEAD" CATALOG_VERSION="6.6" CHECK_DEPS_FLAGS="--check-pkg-deps" before_install: - git clone https://github.com/greghendershott/travis-racket.git ../travis-racket @@ -36,12 +25,11 @@ before_install: - export PATH="${RACKET_DIR}/bin:${PATH}" - export VERSION_SPECIFIC_CATALOG="http://download.racket-lang.org/releases/${CATALOG_VERSION}/catalog/" - raco pkg config --set catalogs $VERSION_SPECIFIC_CATALOG http://pkgs.racket-lang.org http://planet-compats.racket-lang.org - - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco pkg install --deps search-auto cover; fi - - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco pkg install --deps search-auto cover-coveralls; fi + - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco pkg install --auto cover cover-coveralls; fi install: - raco pkg install --auto lens-common/ lens-data/ lens-lib/ lens-unstable/ lens-doc/ lens/ - - raco setup --check-pkg-deps --pkgs lens-common lens-data lens-lib lens-unstable lens-doc lens + - raco setup ${CHECK_DEPS_FLAGS} --pkgs lens-common lens-data lens-lib lens-unstable lens-doc lens script: - raco test -p lens-common lens-data lens-lib lens-unstable lens-doc lens From ff2bb240c5e3650b66d410ea26f320e62a1f6d62 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 25 Aug 2016 09:02:59 -0700 Subject: [PATCH 4/5] Remove setup args, rely on default behavior --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index c51e86e..cb8fdf2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,18 +6,18 @@ env: - VERSION_TO_COVER="6.5" matrix: - RACKET_VERSION="6.0.1" CATALOG_VERSION="6.0.1" - - RACKET_VERSION="6.1" CATALOG_VERSION="6.1" CHECK_DEPS_FLAGS="--check-pkg-deps" - - RACKET_VERSION="6.1.1" CATALOG_VERSION="6.1.1" CHECK_DEPS_FLAGS="--check-pkg-deps" - - RACKET_VERSION="6.2" CATALOG_VERSION="6.2" CHECK_DEPS_FLAGS="--check-pkg-deps" - - RACKET_VERSION="6.2.1" CATALOG_VERSION="6.2.1" CHECK_DEPS_FLAGS="--check-pkg-deps" - - RACKET_VERSION="6.3" CATALOG_VERSION="6.3" CHECK_DEPS_FLAGS="--check-pkg-deps" - - RACKET_VERSION="6.4" CATALOG_VERSION="6.4" CHECK_DEPS_FLAGS="--check-pkg-deps" - - RACKET_VERSION="6.5" CATALOG_VERSION="6.5" CHECK_DEPS_FLAGS="--check-pkg-deps" - - RACKET_VERSION="6.6" CATALOG_VERSION="6.6" CHECK_DEPS_FLAGS="--check-pkg-deps" - - RACKET_VERSION="HEAD" CATALOG_VERSION="6.6" CHECK_DEPS_FLAGS="--check-pkg-deps" + - RACKET_VERSION="6.1" CATALOG_VERSION="6.1" + - RACKET_VERSION="6.1.1" CATALOG_VERSION="6.1.1" + - RACKET_VERSION="6.2" CATALOG_VERSION="6.2" + - RACKET_VERSION="6.2.1" CATALOG_VERSION="6.2.1" + - RACKET_VERSION="6.3" CATALOG_VERSION="6.3" + - RACKET_VERSION="6.4" CATALOG_VERSION="6.4" + - RACKET_VERSION="6.5" CATALOG_VERSION="6.5" + - RACKET_VERSION="6.6" CATALOG_VERSION="6.6" + - RACKET_VERSION="HEAD" CATALOG_VERSION="6.6" matrix: allow_failures: - - env: RACKET_VERSION="HEAD" CATALOG_VERSION="6.6" CHECK_DEPS_FLAGS="--check-pkg-deps" + - env: RACKET_VERSION="HEAD" CATALOG_VERSION="6.6" before_install: - git clone https://github.com/greghendershott/travis-racket.git ../travis-racket @@ -29,7 +29,7 @@ before_install: install: - raco pkg install --auto lens-common/ lens-data/ lens-lib/ lens-unstable/ lens-doc/ lens/ - - raco setup ${CHECK_DEPS_FLAGS} --pkgs lens-common lens-data lens-lib lens-unstable lens-doc lens + - raco setup script: - raco test -p lens-common lens-data lens-lib lens-unstable lens-doc lens From 668094c1d2113161db1b3c0382dc7096623c2cb1 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Thu, 25 Aug 2016 11:38:59 -0700 Subject: [PATCH 5/5] Move dependency-checking from install to tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb8fdf2..9d5e3e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ before_install: install: - raco pkg install --auto lens-common/ lens-data/ lens-lib/ lens-unstable/ lens-doc/ lens/ - - raco setup script: - raco test -p lens-common lens-data lens-lib lens-unstable lens-doc lens - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco cover -f coveralls -d $TRAVIS_BUILD_DIR/coverage -p lens-common lens-data lens-lib lens-unstable lens-doc lens; fi + - raco setup