diff --git a/.gitignore b/.gitignore index c767b9e35..6860f9821 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ tools/deleted_packages.rc /.settings /.vscode/ /bazel.iml +singularity diff --git a/.travis.yml b/.travis.yml index 9800d99ff..4533ced68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,3 +75,10 @@ jobs: - <<: *linux env: V=0.18.0 script: ./travis.sh test +# Test against scala ecosystem source build + - <<: *osx + env: V=0.18.0 + script: ./travis.sh test-singularity + - <<: *linux + env: V=0.18.0 + script: ./travis.sh test-singularity diff --git a/test-singularity.sh b/test-singularity.sh new file mode 100755 index 000000000..203e0cbef --- /dev/null +++ b/test-singularity.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +sha=0ddc53be490bfd068162bcf29a15d5c5183af247 +url="https://github.com/andyscott/singularity/archive/$sha.tar.gz" +location="singularity" +if [ ! -d "$location" ]; then + mkdir -p "$location" + curl -L "$url" | tar zxf - --strip-components=1 -C "$location" +fi + +rules_scala_annex=$(pwd) +( + cd "$location" && \ + bazel test \ + --announce_rc \ + --disk_cache="$rules_scala_annex/.bazel_cache" \ + --override_repository=rules_scala_annex="$rules_scala_annex" \ + --config=quick //repos:test_suite +) \ No newline at end of file diff --git a/tools/gen-ignores.sh b/tools/gen-ignores.sh index dd03482a6..80e8ba065 100755 --- a/tools/gen-ignores.sh +++ b/tools/gen-ignores.sh @@ -3,10 +3,11 @@ cd "$(dirname "$0")"/.. PACKAGES0=$(find -L external-tools -iname BUILD -o -iname BUILD.bazel | xargs -n1 dirname | tr '\n' ,) PACKAGES1=$(find -L tests -iname BUILD -o -iname BUILD.bazel | xargs -n1 dirname | tr '\n' ,) +PACKAGES2=$(find -L singularity -iname BUILD -o -iname BUILD.bazel | xargs -n1 dirname | tr '\n' ,) echo Updating tools/deleted_packages.rc echo '# generated' > tools/deleted_packages.rc -packages=$PACKAGES0,$PACKAGES1 +packages=$PACKAGES0,$PACKAGES1,$PACKAGES2 ( echo "build --deleted_packages=$packages" echo "query --deleted_packages=$packages" diff --git a/travis.sh b/travis.sh index 2e66aef17..69d0ea1da 100755 --- a/travis.sh +++ b/travis.sh @@ -14,6 +14,10 @@ case "$1" in ./test.sh ;; + "test-singularity") + ./test-singularity.sh + ;; + "lint") ./setup-tools.sh --skip-deps ./format.sh check