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

Add go 1.14 to the CI #1092

Merged
merged 6 commits into from
Mar 26, 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: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ matrix:
include:
- go: 1.12.x
- go: 1.13.x
- go: 1.14.x
- arch: s390x
go: 1.12.x
- arch: s390x
go: 1.13.x
- arch: s390x
go: 1.14.x

# Install g++-4.8 to support std=c++11 for github.com/google/certificate-transparency/go/merkletree
addons:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.3@sha256:6a693fbaba7dd8d816f6afce049fb92b280c588e0a677c4c8db26645e613fc15
FROM golang:1.14.1@sha256:08d16c1e689e86df1dae66d8ef4cec49a9d822299ec45e68a810c46cb705628d

WORKDIR /workdir
COPY . /workdir
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.3-alpine3.10@sha256:40278d43a27b6e0563fcc4dd52c991a25741b1a775402aea342ab9a80158e69e as builder
FROM golang:1.14.1-alpine3.11@sha256:244a736db4a1d2611d257e7403c729663ce2eb08d4628868f9d9ef2735496659 as builder

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

FROM alpine:3.10
FROM alpine:3.11
COPY --from=builder /etc/cfssl /etc/cfssl
COPY --from=builder /workdir/bin/ /usr/bin

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cloudflare/cfssl

go 1.13
go 1.14

require (
bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c
Expand Down
4 changes: 0 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
github.com/lib/pq v0.0.0-20180201184707-88edab080323 h1:Ou506ViB5uo2GloKFWIYi5hwRJn4AAOXuLVv8RMY9+4=
github.com/lib/pq v0.0.0-20180201184707-88edab080323/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
Expand Down Expand Up @@ -78,8 +76,6 @@ github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhu
github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is=
github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf h1:Q9MiSA+G9DHe/TzG8pnycDn3HwpQuTygphu9M/7KYqU=
github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf/go.mod h1:w7kd3qXHh8FNaczNjslXqvFQiv5mMWRXlL9klTUAHc8=
github.com/zmap/zlint/v2 v2.0.0-rc4 h1:liUiMWqa52YUvSeSqGOJpqxGwISUi3bNkkmLQtNx7z4=
github.com/zmap/zlint/v2 v2.0.0-rc4/go.mod h1:0jpqZ7cVjm8ABh/PTOp74MK50bPiN+HW+NjjESDxLVA=
github.com/zmap/zlint/v2 v2.0.0 h1:Ve+1yR76LZhTXsxonKA35d5S8dIIW1pmIlr4ahrskhs=
github.com/zmap/zlint/v2 v2.0.0/go.mod h1:0jpqZ7cVjm8ABh/PTOp74MK50bPiN+HW+NjjESDxLVA=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
Expand Down
26 changes: 26 additions & 0 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
# bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c
## explicit
bitbucket.org/liamstask/goose/cmd/goose
bitbucket.org/liamstask/goose/lib/goose
# github.com/GeertJohan/go.incremental v1.0.0
github.com/GeertJohan/go.incremental
# github.com/GeertJohan/go.rice v1.0.0
## explicit
github.com/GeertJohan/go.rice
github.com/GeertJohan/go.rice/embedded
github.com/GeertJohan/go.rice/rice
# github.com/akavel/rsrc v0.8.0
github.com/akavel/rsrc/binutil
github.com/akavel/rsrc/coff
# github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261
## explicit
github.com/certifi/gocertifi
# github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a
## explicit
github.com/cloudflare/backoff
# github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41
## explicit
github.com/cloudflare/go-metrics
# github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c
## explicit
github.com/cloudflare/redoctober/client
github.com/cloudflare/redoctober/config
github.com/cloudflare/redoctober/core
Expand All @@ -34,16 +40,20 @@ github.com/cloudflare/redoctober/symcrypt
# github.com/daaku/go.zipexe v1.0.0
github.com/daaku/go.zipexe
# github.com/getsentry/raven-go v0.0.0-20180121060056-563b81fc02b7
## explicit
github.com/getsentry/raven-go
# github.com/go-sql-driver/mysql v1.3.0
## explicit
github.com/go-sql-driver/mysql
# github.com/golang/protobuf v1.3.1
## explicit
github.com/golang/protobuf/proto
github.com/golang/protobuf/ptypes
github.com/golang/protobuf/ptypes/any
github.com/golang/protobuf/ptypes/duration
github.com/golang/protobuf/ptypes/timestamp
# github.com/google/certificate-transparency-go v1.0.21
## explicit
github.com/google/certificate-transparency-go
github.com/google/certificate-transparency-go/asn1
github.com/google/certificate-transparency-go/client
Expand All @@ -55,43 +65,55 @@ github.com/google/certificate-transparency-go/x509/pkix
# github.com/jessevdk/go-flags v1.4.0
github.com/jessevdk/go-flags
# github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548
## explicit
github.com/jmhodges/clock
# github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade
## explicit
github.com/jmoiron/sqlx
github.com/jmoiron/sqlx/reflectx
# github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49
## explicit
github.com/kisielk/sqlstruct
# github.com/kisom/goutils v1.1.0
## explicit
github.com/kisom/goutils/assert
# github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28
## explicit
github.com/kylelemons/go-gypsy/yaml
# github.com/lib/pq v1.3.0
## explicit
github.com/lib/pq
github.com/lib/pq/oid
github.com/lib/pq/scram
# github.com/mattn/go-sqlite3 v1.10.0
## explicit
github.com/mattn/go-sqlite3
# github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229
github.com/nkovacs/streamquote
# github.com/pkg/errors v0.8.0
## explicit
github.com/pkg/errors
# github.com/valyala/bytebufferpool v1.0.0
github.com/valyala/bytebufferpool
# github.com/valyala/fasttemplate v1.0.1
github.com/valyala/fasttemplate
# github.com/weppos/publicsuffix-go v0.5.0
## explicit
github.com/weppos/publicsuffix-go/publicsuffix
# github.com/ziutek/mymysql v1.5.4
## explicit
github.com/ziutek/mymysql/godrv
github.com/ziutek/mymysql/mysql
github.com/ziutek/mymysql/native
# github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf
## explicit
github.com/zmap/zcrypto/json
github.com/zmap/zcrypto/util
github.com/zmap/zcrypto/x509
github.com/zmap/zcrypto/x509/ct
github.com/zmap/zcrypto/x509/pkix
# github.com/zmap/zlint/v2 v2.0.0
## explicit
github.com/zmap/zlint/v2
github.com/zmap/zlint/v2/lint
github.com/zmap/zlint/v2/lints/apple
Expand All @@ -103,6 +125,7 @@ github.com/zmap/zlint/v2/lints/mozilla
github.com/zmap/zlint/v2/lints/rfc
github.com/zmap/zlint/v2/util
# golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68
## explicit
golang.org/x/crypto/cryptobyte
golang.org/x/crypto/cryptobyte/asn1
golang.org/x/crypto/ed25519
Expand All @@ -113,13 +136,16 @@ golang.org/x/crypto/pkcs12
golang.org/x/crypto/pkcs12/internal/rc2
golang.org/x/crypto/scrypt
# golang.org/x/lint v0.0.0-20190930215403-16217165b5de
## explicit
golang.org/x/lint
golang.org/x/lint/golint
# golang.org/x/net v0.0.0-20190620200207-3b0461eec859
## explicit
golang.org/x/net/context
golang.org/x/net/context/ctxhttp
golang.org/x/net/idna
# golang.org/x/text v0.3.2
## explicit
golang.org/x/text/secure/bidirule
golang.org/x/text/transform
golang.org/x/text/unicode/bidi
Expand Down