From f6fc0f6c6251be98c77b749d2ea1a350196d6792 Mon Sep 17 00:00:00 2001 From: Hunter Long Date: Sat, 18 Apr 2020 01:53:01 -0700 Subject: [PATCH] build docker images --- .github/workflows/master.yml | 9 ++++-- .travis.yml | 53 ------------------------------------ 2 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 886ec6d1..d8299ef5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -128,8 +128,13 @@ jobs: chmod +x statping mv statping $(go env GOPATH)/bin/ - - name: Cypress E2E Testing - uses: cypress-io/github-action@v1 +# - name: Cypress E2E Testing +# uses: cypress-io/github-action@v1 +# with: +# start: npm start +# wait-on: http://localhost:3030 +# record: false +# parallel: false - name: Go Tests run: SASS=`which sass` go test -v -covermode=count -coverprofile=coverage.out -p=1 ./... diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0366ad32..00000000 --- a/.travis.yml +++ /dev/null @@ -1,53 +0,0 @@ -after_success: - - "if [[ \"$TRAVIS_BRANCH\" == \"master\" && \"$TRAVIS_PULL_REQUEST\" = \"false\" ]]; then make travis-build; fi" -before_install: - - "rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install stable" - - "nvm install 10.17.0" - - "nvm use 10.17.0 --default" -before_script: - - "mysql -e 'CREATE DATABASE IF NOT EXISTS test;'" - - "psql -c 'create database test;' -U postgres" -branches: - only: - - master - - dev -env: - global: - - "PATH=$HOME/.local/bin:$PATH" - - DB_HOST=localhost - - DB_USER=travis - - DB_PASS= - - DB_DATABASE=test - - GO_ENV=test - - STATPING_DIR=$GOPATH/src/github.com/statping/statping -go: 1.14 -go_import_path: github.com/statping/statping -install: - - "npm install -g sass newman cross-env wait-on @sentry/cli" - - "pip install --user awscli" - - "go get github.com/mattn/goveralls" - - "go mod download" - - "go mod verify" - - "make test-deps yarn clean compile install" -language: go -addons: - apt: - packages: - - libgconf-2-4 -matrix: - allow_failures: - - go: master - fast_finish: true -notifications: - email: true -os: - - linux -script: - - "if [[ \"$TRAVIS_BRANCH\" == \"dev\" && \"$TRAVIS_PULL_REQUEST\" = \"false\" ]]; then make dockerhub-dev; fi" - - "travis_retry make clean test-ci" - - "if [[ \"$TRAVIS_BRANCH\" == \"master\" && \"$TRAVIS_PULL_REQUEST\" = \"false\" ]]; then make coverage; fi" -services: - - docker - - postgresql - - mysql - - mongodb