Skip to content

Commit

Permalink
fix: migrate to common prism setup (#391)
Browse files Browse the repository at this point in the history
  • Loading branch information
childish-sambino committed May 8, 2020
1 parent 640cd9b commit adab2f1
Show file tree
Hide file tree
Showing 7 changed files with 266 additions and 822 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ temp.go
.env
coverage.txt
sendgrid.env
.vscode
.vscode
prism
24 changes: 11 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
language: go
go:
- 1.7.x
- 1.8.x
- 1.9.x
- 1.10.x
- 1.11.x
- 1.12.x
- 1.13.x
- 1.14.x
- tip

before_script:
- $HOME/gopath/src/github.com/sendgrid/sendgrid-go/prism.sh
env:
- version=1.7
- version=1.8
- version=1.9
- version=1.10
- version=1.11
- version=1.12
- version=1.13
- version=1.14
- version=latest

script:
- make test
- make test-docker

after_success:
- bash <(curl -s https://codecov.io/bash)
Expand Down
10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ARG version=latest
FROM golang:$version

COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt
RUN update-ca-certificates

WORKDIR /go/src/github.com/sendgrid/sendgrid-go
COPY . .

RUN make install
11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
.PHONY: test install
.PHONY: test install test-integ test-docker

install:
go get -t -v ./...

test: install
test:
./go.coverage.sh
go test -cover -v -race ./... | grep -v -E '/vendor|/examples|/docker'

test-integ: test

version ?= latest
test-docker:
curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/master/prism/prism.sh | version=$(version) bash
7 changes: 0 additions & 7 deletions go.test.sh

This file was deleted.

42 changes: 0 additions & 42 deletions prism.sh

This file was deleted.

Loading

0 comments on commit adab2f1

Please sign in to comment.