Skip to content

Commit f30ae6a

Browse files
authored
Add go 1.14 to the CI (#1092)
* Update mod * Include go 1.14 to CI * Update go to 1.14 in dockerfiles
1 parent abef926 commit f30ae6a

6 files changed

Lines changed: 33 additions & 8 deletions

File tree

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ matrix:
55
include:
66
- go: 1.12.x
77
- go: 1.13.x
8+
- go: 1.14.x
89
- arch: s390x
910
go: 1.12.x
1011
- arch: s390x
1112
go: 1.13.x
13+
- arch: s390x
14+
go: 1.14.x
1215

1316
# Install g++-4.8 to support std=c++11 for github.com/google/certificate-transparency/go/merkletree
1417
addons:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13.3@sha256:6a693fbaba7dd8d816f6afce049fb92b280c588e0a677c4c8db26645e613fc15
1+
FROM golang:1.14.1@sha256:08d16c1e689e86df1dae66d8ef4cec49a9d822299ec45e68a810c46cb705628d
22

33
WORKDIR /workdir
44
COPY . /workdir

Dockerfile.alpine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13.3-alpine3.10@sha256:40278d43a27b6e0563fcc4dd52c991a25741b1a775402aea342ab9a80158e69e as builder
1+
FROM golang:1.14.1-alpine3.11@sha256:244a736db4a1d2611d257e7403c729663ce2eb08d4628868f9d9ef2735496659 as builder
22

33
WORKDIR /workdir
44
COPY . /workdir
@@ -11,7 +11,7 @@ RUN git clone https://github.com/cloudflare/cfssl_trust.git /etc/cfssl && \
1111
make bin/rice && ./bin/rice embed-go -i=./cli/serve && \
1212
make all
1313

14-
FROM alpine:3.10
14+
FROM alpine:3.11
1515
COPY --from=builder /etc/cfssl /etc/cfssl
1616
COPY --from=builder /workdir/bin/ /usr/bin
1717

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cloudflare/cfssl
22

3-
go 1.13
3+
go 1.14
44

55
require (
66
bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
4545
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
4646
github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
4747
github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
48-
github.com/lib/pq v0.0.0-20180201184707-88edab080323 h1:Ou506ViB5uo2GloKFWIYi5hwRJn4AAOXuLVv8RMY9+4=
49-
github.com/lib/pq v0.0.0-20180201184707-88edab080323/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
5048
github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
5149
github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
5250
github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
@@ -78,8 +76,6 @@ github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhu
7876
github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is=
7977
github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf h1:Q9MiSA+G9DHe/TzG8pnycDn3HwpQuTygphu9M/7KYqU=
8078
github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf/go.mod h1:w7kd3qXHh8FNaczNjslXqvFQiv5mMWRXlL9klTUAHc8=
81-
github.com/zmap/zlint/v2 v2.0.0-rc4 h1:liUiMWqa52YUvSeSqGOJpqxGwISUi3bNkkmLQtNx7z4=
82-
github.com/zmap/zlint/v2 v2.0.0-rc4/go.mod h1:0jpqZ7cVjm8ABh/PTOp74MK50bPiN+HW+NjjESDxLVA=
8379
github.com/zmap/zlint/v2 v2.0.0 h1:Ve+1yR76LZhTXsxonKA35d5S8dIIW1pmIlr4ahrskhs=
8480
github.com/zmap/zlint/v2 v2.0.0/go.mod h1:0jpqZ7cVjm8ABh/PTOp74MK50bPiN+HW+NjjESDxLVA=
8581
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

vendor/modules.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
# bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c
2+
## explicit
23
bitbucket.org/liamstask/goose/cmd/goose
34
bitbucket.org/liamstask/goose/lib/goose
45
# github.com/GeertJohan/go.incremental v1.0.0
56
github.com/GeertJohan/go.incremental
67
# github.com/GeertJohan/go.rice v1.0.0
8+
## explicit
79
github.com/GeertJohan/go.rice
810
github.com/GeertJohan/go.rice/embedded
911
github.com/GeertJohan/go.rice/rice
1012
# github.com/akavel/rsrc v0.8.0
1113
github.com/akavel/rsrc/binutil
1214
github.com/akavel/rsrc/coff
1315
# github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261
16+
## explicit
1417
github.com/certifi/gocertifi
1518
# github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a
19+
## explicit
1620
github.com/cloudflare/backoff
1721
# github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41
22+
## explicit
1823
github.com/cloudflare/go-metrics
1924
# github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c
25+
## explicit
2026
github.com/cloudflare/redoctober/client
2127
github.com/cloudflare/redoctober/config
2228
github.com/cloudflare/redoctober/core
@@ -34,16 +40,20 @@ github.com/cloudflare/redoctober/symcrypt
3440
# github.com/daaku/go.zipexe v1.0.0
3541
github.com/daaku/go.zipexe
3642
# github.com/getsentry/raven-go v0.0.0-20180121060056-563b81fc02b7
43+
## explicit
3744
github.com/getsentry/raven-go
3845
# github.com/go-sql-driver/mysql v1.3.0
46+
## explicit
3947
github.com/go-sql-driver/mysql
4048
# github.com/golang/protobuf v1.3.1
49+
## explicit
4150
github.com/golang/protobuf/proto
4251
github.com/golang/protobuf/ptypes
4352
github.com/golang/protobuf/ptypes/any
4453
github.com/golang/protobuf/ptypes/duration
4554
github.com/golang/protobuf/ptypes/timestamp
4655
# github.com/google/certificate-transparency-go v1.0.21
56+
## explicit
4757
github.com/google/certificate-transparency-go
4858
github.com/google/certificate-transparency-go/asn1
4959
github.com/google/certificate-transparency-go/client
@@ -55,43 +65,55 @@ github.com/google/certificate-transparency-go/x509/pkix
5565
# github.com/jessevdk/go-flags v1.4.0
5666
github.com/jessevdk/go-flags
5767
# github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548
68+
## explicit
5869
github.com/jmhodges/clock
5970
# github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade
71+
## explicit
6072
github.com/jmoiron/sqlx
6173
github.com/jmoiron/sqlx/reflectx
6274
# github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49
75+
## explicit
6376
github.com/kisielk/sqlstruct
6477
# github.com/kisom/goutils v1.1.0
78+
## explicit
6579
github.com/kisom/goutils/assert
6680
# github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28
81+
## explicit
6782
github.com/kylelemons/go-gypsy/yaml
6883
# github.com/lib/pq v1.3.0
84+
## explicit
6985
github.com/lib/pq
7086
github.com/lib/pq/oid
7187
github.com/lib/pq/scram
7288
# github.com/mattn/go-sqlite3 v1.10.0
89+
## explicit
7390
github.com/mattn/go-sqlite3
7491
# github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229
7592
github.com/nkovacs/streamquote
7693
# github.com/pkg/errors v0.8.0
94+
## explicit
7795
github.com/pkg/errors
7896
# github.com/valyala/bytebufferpool v1.0.0
7997
github.com/valyala/bytebufferpool
8098
# github.com/valyala/fasttemplate v1.0.1
8199
github.com/valyala/fasttemplate
82100
# github.com/weppos/publicsuffix-go v0.5.0
101+
## explicit
83102
github.com/weppos/publicsuffix-go/publicsuffix
84103
# github.com/ziutek/mymysql v1.5.4
104+
## explicit
85105
github.com/ziutek/mymysql/godrv
86106
github.com/ziutek/mymysql/mysql
87107
github.com/ziutek/mymysql/native
88108
# github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf
109+
## explicit
89110
github.com/zmap/zcrypto/json
90111
github.com/zmap/zcrypto/util
91112
github.com/zmap/zcrypto/x509
92113
github.com/zmap/zcrypto/x509/ct
93114
github.com/zmap/zcrypto/x509/pkix
94115
# github.com/zmap/zlint/v2 v2.0.0
116+
## explicit
95117
github.com/zmap/zlint/v2
96118
github.com/zmap/zlint/v2/lint
97119
github.com/zmap/zlint/v2/lints/apple
@@ -103,6 +125,7 @@ github.com/zmap/zlint/v2/lints/mozilla
103125
github.com/zmap/zlint/v2/lints/rfc
104126
github.com/zmap/zlint/v2/util
105127
# golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68
128+
## explicit
106129
golang.org/x/crypto/cryptobyte
107130
golang.org/x/crypto/cryptobyte/asn1
108131
golang.org/x/crypto/ed25519
@@ -113,13 +136,16 @@ golang.org/x/crypto/pkcs12
113136
golang.org/x/crypto/pkcs12/internal/rc2
114137
golang.org/x/crypto/scrypt
115138
# golang.org/x/lint v0.0.0-20190930215403-16217165b5de
139+
## explicit
116140
golang.org/x/lint
117141
golang.org/x/lint/golint
118142
# golang.org/x/net v0.0.0-20190620200207-3b0461eec859
143+
## explicit
119144
golang.org/x/net/context
120145
golang.org/x/net/context/ctxhttp
121146
golang.org/x/net/idna
122147
# golang.org/x/text v0.3.2
148+
## explicit
123149
golang.org/x/text/secure/bidirule
124150
golang.org/x/text/transform
125151
golang.org/x/text/unicode/bidi

0 commit comments

Comments
 (0)