diff --git a/.travis.yml b/.travis.yml index f951a82..6ecd682 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,15 @@ jobs: - env: LISP=mkcl - env: LISP=abcl include: + - os: windows + env: LISP=sbcl-bin + - os: linux + arch: arm64 + env: LISP=sbcl-bin + addons: + apt: + packages: + - libcurl4-openssl-dev - sudo: required name: "valgrind" os: linux @@ -73,15 +82,6 @@ jobs: packages: - pandoc - ruby-sass - - os: windows - env: LISP=sbcl-bin - - os: linux - arch: arm64 - env: LISP=sbcl-bin - addons: - apt: - packages: - - libcurl4-openssl-dev - os: linux name: "linuxbrew" install: diff --git a/scripts/install-for-ci.sh b/scripts/install-for-ci.sh index e4b3d35..a9135a5 100644 --- a/scripts/install-for-ci.sh +++ b/scripts/install-for-ci.sh @@ -106,7 +106,7 @@ install_ecl () { fi } -if which sudo >/dev/null; then +if which sudo 2>&1 >/dev/null; then SUDO=sudo fi @@ -114,23 +114,19 @@ install_roswell_bin () { if uname -s | grep -E "MSYS_NT|MINGW64" >/dev/null; then if [ $ROSWELL_BRANCH = release ]; then fetch "https://github.com/roswell/roswell/releases/download/v$ROSWELL_RELEASE_VERSION/roswell_${ROSWELL_RELEASE_VERSION}_amd64.zip" /tmp/roswell.zip - else - fetch "https://ci.appveyor.com/api/projects/snmsts/roswell-en89n/artifacts/Roswell-x86_64.zip?branch=master&job=Environment%3A%20MSYS2_ARCH%3Dx86_64,%20MSYS2_BITS%3D64,%20MSYSTEM%3DMINGW64,%20METHOD%3Dcross" /tmp/roswell.zip + unzip /tmp/roswell.zip -d /tmp/ >/dev/null + mkdir -p $ROSWELL_INSTALL_DIR/bin + cp /tmp/roswell/ros.exe $ROSWELL_INSTALL_DIR/bin + cp -r /tmp/roswell/lisp $ROSWELL_INSTALL_DIR/bin/lisp fi - unzip /tmp/roswell.zip -d /tmp/ >/dev/null - mkdir -p $ROSWELL_INSTALL_DIR/bin - cp /tmp/roswell/ros.exe $ROSWELL_INSTALL_DIR/bin - cp -r /tmp/roswell/lisp $ROSWELL_INSTALL_DIR/bin/lisp elif uname -s | grep -E "MINGW32" >/dev/null; then if [ $ROSWELL_BRANCH = release ]; then fetch "https://github.com/roswell/roswell/releases/download/v$ROSWELL_RELEASE_VERSION/roswell_${ROSWELL_RELEASE_VERSION}_i686.zip" /tmp/roswell.zip - else - fetch "https://ci.appveyor.com/api/projects/snmsts/roswell-en89n/artifacts/Roswell-i686.zip?branch=master&job=Environment%3A%20MSYS2_ARCH%3Di686,%20MSYS2_BITS%3D32,%20MSYSTEM%3DMINGW32,%20METHOD%3Dcross" /tmp/roswell.zip + unzip /tmp/roswell.zip -d /tmp/ >/dev/null + mkdir -p $ROSWELL_INSTALL_DIR/bin + cp /tmp/roswell/ros.exe $ROSWELL_INSTALL_DIR/bin + cp -r /tmp/roswell/lisp $ROSWELL_INSTALL_DIR/bin/lisp fi - unzip /tmp/roswell.zip -d /tmp/ >/dev/null - mkdir -p $ROSWELL_INSTALL_DIR/bin - cp /tmp/roswell/ros.exe $ROSWELL_INSTALL_DIR/bin - cp -r /tmp/roswell/lisp $ROSWELL_INSTALL_DIR/bin/lisp elif uname -s |grep Linux >/dev/null && uname -m |grep x86_64 >/dev/null && which dpkg >/dev/null; then if ! [ -w "$ROSWELL_INSTALL_DIR" ]; then if [ $ROSWELL_BRANCH = release ]; then