File tree Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ dist: xenial
19
19
20
20
language : go
21
21
go :
22
- - 1.12
22
+ - 1.13
23
23
24
24
# Without this, annotator.sh fails, related to gcloud.
25
25
sudo : required
@@ -72,7 +72,10 @@ script:
72
72
- source "${HOME}/google-cloud-sdk/path.bash.inc"
73
73
74
74
# Run all tests and gather and submit coverage information.
75
- - GCLOUD_PROJECT=mlab-testing go test -v -coverpkg=./... -coverprofile=coverage.cov ./...
75
+ # - GCLOUD_PROJECT=mlab-testing go test -v -coverpkg=./... -coverprofile=coverage.cov ./...
76
+ # Exclude main.go from tests to prevent "duplicate main.init.0" errors.
77
+ - GCLOUD_PROJECT=mlab-testing go test -v -coverpkg=./... -coverprofile=coverage.cov ./asn/... ./legacy/... ./handler/... ./metrics/... ./geoloader/... ./manager/... ./geolite2v2/... ./api/... ./loader/... ./directory/... ./iputils/...
78
+
76
79
- $HOME/gopath/bin/goveralls -coverprofile=coverage.cov -service=travis-ci
77
80
# Run benchmarks
78
81
- go test -bench . ./geolite2v2/...
Original file line number Diff line number Diff line change 1
- FROM golang:alpine as build
1
+ FROM golang:1.13- alpine as build
2
2
3
3
RUN apk add --no-cache git pkgconfig geoip-dev geoip gcc libc-dev
4
4
ADD . /go/src/github.com/m-lab/annotation-service
Original file line number Diff line number Diff line change @@ -9,11 +9,11 @@ service: annotator
9
9
10
10
# TODO(dev): adjust CPU and memory based on actual requirements.
11
11
resources :
12
- cpu : 20
12
+ cpu : 30
13
13
# Instances support between [(cpu * 0.9) - 0.4, (cpu * 6.5) - 0.4]
14
14
# Actual memory available is exposed via GAE_MEMORY_MB environment variable.
15
15
# Service now loads ALL datasets, so it needs quite a lot of memory.
16
- memory_gb : 129
16
+ memory_gb : 194
17
17
18
18
# Annotation service uses disk for loading legacy Geolite datasets. It now loads many
19
19
# concurrently, so needs a lot of disk space.
You can’t perform that action at this time.
0 commit comments