travis no support for docker on MacOS; try 'normal' build

This commit is contained in:
Fabio Barone 2020-05-15 17:06:19 -05:00
parent 91f7e2a879
commit 8c762aa812
4 changed files with 27 additions and 21 deletions

View File

@ -2,22 +2,8 @@
set -ev set -ev
brew update go get -d -v github.com/ava-labs/gecko/...
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
# IS THIS HACK NEEDED FOR MAC? brew update
#docker --version sudo chown -R $(whoami) $(brew --prefix)/*
#cat /etc/docker/daemon.json brew install Determinant/salticidae/salticidae@31
#rm -f /etc/docker/daemon.json
#systemctl restart docker

6
.ci/runscript_linux.sh Executable file
View File

@ -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"

7
.ci/runscript_osx.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
set -ev
cd $GOPATH/src/github.com/ava-labs/gecko
./scripts/build_test.sh
./scripts/build.sh

View File

@ -1,9 +1,13 @@
language: go language: go
go:
- 1.13.x
jobs: jobs:
include: include:
#- os: linux #- os: linux
# dist: bionic # dist: bionic
- os: osx - os: osx
osx_image: xcode11.4
services: services:
- docker - docker
env: env:
@ -18,10 +22,13 @@ before_install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/before_install_osx.sh; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/before_install_osx.sh; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/before_install_linux.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: script:
- docker run --rm -v "$PWD:$GECKO_HOME" $DOCKERHUB_REPO:$COMMIT bash "$GECKO_HOME/scripts/build_test.sh" - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .ci/runscript_osx.sh; fi
- docker run --rm -v "$PWD:$GECKO_HOME" $DOCKERHUB_REPO:$COMMIT bash "$GECKO_HOME/scripts/build.sh" - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/runscript_linux.sh; fi
#Need to push to docker hub only from one build #Need to push to docker hub only from one build
after_success: after_success:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/after_success.sh; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .ci/after_success.sh; fi