Merge pull request #9 from armedbear/master

Reassure git who's master
armedbear · Nov 24, 2019 · 9f79786 · 9f79786
2 parents 42c6c0e + a62ae2a
commit 9f79786
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,8 @@ env:
 install:
   - echo $(pwd)
   - bash -x ${TRAVIS_BUILD_DIR}/ci/install-adoptjdk.bash ${ABCL_JDK}
+  # Ensure we can invoke ant
+  - . ${TRAVIS_BUILD_DIR}/ci/ensure-jenv-is-present.bash && ant abcl.diagnostic
   # Build ABCL
   - . ${TRAVIS_BUILD_DIR}/ci/ensure-jenv-is-present.bash && ant abcl
   # Configure finding abcl build source via ASDF

diff --git a/ci/set-jdk.bash b/ci/set-jdk.bash
@@ -4,7 +4,7 @@ function set_jdk() {
         abcl_jdk=openjdk8
     fi
 
-    dir=$1
+    dir=$2
     if [[ -z ${dir} ]]; then
         dir=${TRAVIS_BUILD_DIR}
     fi