Merge pull request #1143 from nickysemenza/add-go-1.15

cloudflare · Nov 13, 2020 · aebbc13 · aebbc13
2 parents c1bf7b9 + f712ad9
commit aebbc13
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 5,709 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,13 +6,15 @@ matrix:
     - go: 1.12.x
     - go: 1.13.x
     - go: 1.14.x
+    - go: 1.15.x
     - arch: s390x
       go: 1.12.x
     - arch: s390x
       go: 1.13.x
     - arch: s390x
       go: 1.14.x
-
+    - arch: s390x
+      go: 1.15.x
 # Install g++-4.8 to support std=c++11 for github.com/google/certificate-transparency/go/merkletree
 addons:
   apt:

diff --git a/bundler/bundler_test.go b/bundler/bundler_test.go
@@ -15,7 +15,9 @@ import (
 )
 
 const (
-	testCaBundle        = "testdata/ca-bundle.pem"
+	// from https://github.com/cloudflare/cfssl_trust/blob/master/ca-bundle.crt
+	testCaBundle = "testdata/ca-bundle.pem"
+	// from https://github.com/cloudflare/cfssl_trust/blob/master/int-bundle.crt
 	testIntCaBundle     = "testdata/int-bundle.pem"
 	testNSSRootBundle   = "testdata/nss.pem"
 	testMetadata        = "testdata/ca-bundle.crt.metadata"