Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: migrate to common prism setup #391

Merged
merged 1 commit into from
May 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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