diff --git a/.ci/before_install_osx.sh b/.ci/before_install_osx.sh index 70a14a3..55295d1 100755 --- a/.ci/before_install_osx.sh +++ b/.ci/before_install_osx.sh @@ -2,22 +2,8 @@ set -ev -brew update -brew install docker -brew install docker-machine -brew cask install virtualbox -docker-machine create --driver virtualbox default -docker-machine start default -# hack to address problem with using DOCKER_BUILDKIT=1, inspired by: -# * https://github.com/rootless-containers/usernetes/blob/master/.travis.yml -# -# links discussing the issue: -# * https://github.com/moby/buildkit/issues/606#issuecomment-453959632 -# * https://travis-ci.community/t/docker-builds-are-broken-if-buildkit-is-used-docker-buildkit-1/2994 -# * https://github.com/moby/moby/issues/39120 +go get -d -v github.com/ava-labs/gecko/... -# IS THIS HACK NEEDED FOR MAC? -#docker --version -#cat /etc/docker/daemon.json -#rm -f /etc/docker/daemon.json -#systemctl restart docker +brew update +sudo chown -R $(whoami) $(brew --prefix)/* +brew install Determinant/salticidae/salticidae@31 diff --git a/.ci/runscript_linux.sh b/.ci/runscript_linux.sh new file mode 100755 index 0000000..d7fb2de --- /dev/null +++ b/.ci/runscript_linux.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ev + +docker run --rm -v "$PWD:$GECKO_HOME" $DOCKERHUB_REPO:$COMMIT bash "$GECKO_HOME/scripts/build_test.sh" +docker run --rm -v "$PWD:$GECKO_HOME" $DOCKERHUB_REPO:$COMMIT bash "$GECKO_HOME/scripts/build.sh" diff --git a/.ci/runscript_osx.sh b/.ci/runscript_osx.sh new file mode 100755 index 0000000..df7e2ee --- /dev/null +++ b/.ci/runscript_osx.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -ev + +cd $GOPATH/src/github.com/ava-labs/gecko +./scripts/build_test.sh +./scripts/build.sh diff --git a/.travis.yml b/.travis.yml index 8863253..e1d6d43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ language: go +go: + - 1.13.x + jobs: include: #- os: linux # dist: bionic - os: osx + osx_image: xcode11.4 services: - docker env: @@ -18,10 +22,13 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/before_install_osx.sh; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/before_install_linux.sh; fi -install: DOCKER_BUILDKIT=1 docker build --progress plain -t $DOCKERHUB_REPO:$COMMIT . +install: + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then DOCKER_BUILDKIT=1 docker build --progress plain -t $DOCKERHUB_REPO:$COMMIT; fi + script: - - docker run --rm -v "$PWD:$GECKO_HOME" $DOCKERHUB_REPO:$COMMIT bash "$GECKO_HOME/scripts/build_test.sh" - - docker run --rm -v "$PWD:$GECKO_HOME" $DOCKERHUB_REPO:$COMMIT bash "$GECKO_HOME/scripts/build.sh" + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/runscript_osx.sh; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/runscript_linux.sh; fi + #Need to push to docker hub only from one build after_success: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/after_success.sh; fi