From ebbdab3de88ac4cdc26672f5b526a9b6038ebbd7 Mon Sep 17 00:00:00 2001 From: Greg Hendershott Date: Mon, 18 May 2015 20:34:57 -0400 Subject: [PATCH] Switch from RACKET_EDITION=MINIMAL to RACKET_MINIMAL=1 Also: - Only support it for 6.x and HEAD. Don't bother with 5.9x, and don't try to support textual (it's too different). - For the minimal case, do the raco pkg install of rackunit in install-racket.sh. Can conditionally test, there. Also, easier for users than them having to do it in .travis.yml. --- .travis.yml | 18 +++++++----------- install-racket.sh | 27 ++++++++++----------------- 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bac3a8..00e3bc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,22 +29,19 @@ env: - RACKET_VERSION=6.1.1 - RACKET_VERSION=HEAD - RACKET_VERSION=SCOPE_SNAPSHOT - # Optionally supply RACKET_EDITION with the value FULL or MINIMAL. - # Defaults to FULL. - - RACKET_VERSION=5.3.4 RACKET_EDITION=MINIMAL - - RACKET_VERSION=5.3.5 RACKET_EDITION=MINIMAL - - RACKET_VERSION=5.92 RACKET_EDITION=MINIMAL - - RACKET_VERSION=6.0 RACKET_EDITION=MINIMAL - - RACKET_VERSION=6.1 RACKET_EDITION=MINIMAL - - RACKET_VERSION=6.1.1 RACKET_EDITION=MINIMAL - - RACKET_VERSION=HEAD RACKET_EDITION=MINIMAL + # Optionally, can also supply RACKET_MINIMAL=1. Only works for + # Racket 6.0+ or HEAD. + - RACKET_VERSION=6.0 RACKET_MINIMAL=1 + - RACKET_VERSION=6.1 RACKET_MINIMAL=1 + - RACKET_VERSION=6.1.1 RACKET_MINIMAL=1 + - RACKET_VERSION=HEAD RACKET_MINIMAL=1 # You may want to test against certain versions of Racket, without # having them count against the overall success/failure. matrix: allow_failures: - env: RACKET_VERSION=HEAD - - env: RACKET_VERSION=HEAD RACKET_EDITION=MINIMAL + - env: RACKET_VERSION=HEAD RACKET_MINIMAL=1 - env: RACKET_VERSION=SCOPE_SNAPSHOT # Fast finish: Overall build result is determined as soon as any of # its rows have failed, or, all of its rows that aren't allowed to @@ -66,7 +63,6 @@ before_script: # Here supply steps such as raco make, raco test, etc. script: - - raco pkg install --scope installation rackunit # in case minimal racket - raco test -x . # NOTE: If your repo is a Racket package with an info.rkt that diff --git a/install-racket.sh b/install-racket.sh index 98f1328..b4ab9d3 100755 --- a/install-racket.sh +++ b/install-racket.sh @@ -3,12 +3,8 @@ set -e -if [[ "$RACKET_EDITION" = "" ]]; then - RACKET_EDITION="FULL" -fi - if [[ "$RACKET_VERSION" = "HEAD" ]]; then - if [[ "$RACKET_EDITION" = "MINIMAL" ]]; then + if [[ "$RACKET_MINIMAL" = "1" ]]; then URL="http://plt.eecs.northwestern.edu/snapshots/current/installers/min-racket-current-x86_64-linux-precise.sh" else URL="http://plt.eecs.northwestern.edu/snapshots/current/installers/racket-test-current-x86_64-linux-precise.sh" @@ -16,23 +12,15 @@ if [[ "$RACKET_VERSION" = "HEAD" ]]; then elif [[ "$RACKET_VERSION" = "SCOPE_SNAPSHOT" ]]; then URL="http://www.cs.utah.edu/~mflatt/tmp/scope-snapshot/installers/racket-6.2.900.3-x86_64-linux.sh" elif [[ "$RACKET_VERSION" = 5.9* ]]; then - if [[ "$RACKET_EDITION" = "MINIMAL" ]]; then - URL="http://mirror.racket-lang.org/installers/${RACKET_VERSION}/racket-minimal-${RACKET_VERSION}-x86_64-linux-ubuntu-quantal.sh" - else - URL="http://download.racket-lang.org/installers/${RACKET_VERSION}/racket-${RACKET_VERSION}-x86_64-linux-ubuntu-quantal.sh" - fi + URL="http://download.racket-lang.org/installers/${RACKET_VERSION}/racket-${RACKET_VERSION}-x86_64-linux-ubuntu-quantal.sh" elif [[ "$RACKET_VERSION" = 6.* ]]; then - if [[ "$RACKET_EDITION" = "MINIMAL" ]]; then + if [[ "$RACKET_MINIMAL" = "1" ]]; then URL="http://mirror.racket-lang.org/installers/${RACKET_VERSION}/racket-minimal-${RACKET_VERSION}-x86_64-linux-ubuntu-precise.sh" else URL="http://download.racket-lang.org/installers/${RACKET_VERSION}/racket-${RACKET_VERSION}-x86_64-linux-ubuntu-precise.sh" fi -else - if [[ "$RACKET_EDITION" = "MINIMAL" ]]; then - URL="http://mirror.racket-lang.org/installers/${RACKET_VERSION}/racket-textual/racket-textual-${RACKET_VERSION}-bin-x86_64-linux-debian-squeeze.sh" - else - URL="http://download.racket-lang.org/installers/${RACKET_VERSION}/racket/racket-${RACKET_VERSION}-bin-x86_64-linux-debian-squeeze.sh" - fi +else # 5.3.x + URL="http://download.racket-lang.org/installers/${RACKET_VERSION}/racket/racket-${RACKET_VERSION}-bin-x86_64-linux-debian-squeeze.sh" fi # Older .travis.yml files don't set $RACKET_DIR (the Racket install @@ -64,4 +52,9 @@ no EOF +if [[ "$RACKET_MINIMAL" = "1" ]]; then + echo "Minimal Racket: Installing rackunit package..." + raco pkg install --auto --scope installation rackunit +fi + exit 0