Skip to content

Commit aebbc13

Browse files
authored
Merge pull request #1143 from nickysemenza/add-go-1.15
2 parents c1bf7b9 + f712ad9 commit aebbc13

File tree

4 files changed

+61
-5709
lines changed

4 files changed

+61
-5709
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ matrix:
66
- go: 1.12.x
77
- go: 1.13.x
88
- go: 1.14.x
9+
- go: 1.15.x
910
- arch: s390x
1011
go: 1.12.x
1112
- arch: s390x
1213
go: 1.13.x
1314
- arch: s390x
1415
go: 1.14.x
15-
16+
- arch: s390x
17+
go: 1.15.x
1618
# Install g++-4.8 to support std=c++11 for github.com/google/certificate-transparency/go/merkletree
1719
addons:
1820
apt:

bundler/bundler_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import (
1515
)
1616

1717
const (
18-
testCaBundle = "testdata/ca-bundle.pem"
18+
// from https://github.com/cloudflare/cfssl_trust/blob/master/ca-bundle.crt
19+
testCaBundle = "testdata/ca-bundle.pem"
20+
// from https://github.com/cloudflare/cfssl_trust/blob/master/int-bundle.crt
1921
testIntCaBundle = "testdata/int-bundle.pem"
2022
testNSSRootBundle = "testdata/nss.pem"
2123
testMetadata = "testdata/ca-bundle.crt.metadata"

0 commit comments

Comments
 (0)