From abfae035775e97886fdd1798243286b788a0ed54 Mon Sep 17 00:00:00 2001 From: Edward Muller Date: Fri, 12 Apr 2019 11:31:13 -0700 Subject: [PATCH] Add go1.12.4 / 1.11.9 --- CHANGELOG.md | 3 +++ data.json | 10 +++++----- files.json | 8 ++++++++ test/run.sh | 8 -------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 980536cb..041c015a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Go Buildpack Changelog ## Unreleased +* Add go1.12.4, expand go1.12 to go1.12.4, and default to go1.12.4 +* Add go1.11.9 and expand go1.11 to go.11.9. +* Restore vendored mattes migrate teset on cedar:14 (finally fixed in ^) ## v109 (2019-04-09) * Add go1.12.3, expand go1.12 to go1.12.3, and default to go1.12.3 diff --git a/data.json b/data.json index a1b80b34..63782e8f 100644 --- a/data.json +++ b/data.json @@ -1,11 +1,11 @@ { "Go": { - "DefaultVersion": "go1.12.3", + "DefaultVersion": "go1.12.4", "VersionExpansion": { "go1.12.0": "go1.12", - "go1.12": "go1.12.3", + "go1.12": "go1.12.4", "go1.11.0": "go1.11", - "go1.11": "go1.11.8", + "go1.11": "go1.11.9", "go1.10.0": "go1.10", "go1.10": "go1.10.8", "go1.9.0": "go1.9", @@ -98,8 +98,8 @@ "assets": [ "stdlib.sh.v8", "jq-linux64", - "go1.11.8.linux-amd64.tar.gz", - "go1.12.3.linux-amd64.tar.gz", + "go1.11.9.linux-amd64.tar.gz", + "go1.12.4.linux-amd64.tar.gz", "go1.10.8.linux-amd64.tar.gz", "go1.8.3.linux-amd64.tar.gz", "go1.7.6.linux-amd64.tar.gz", diff --git a/files.json b/files.json index 09d8977c..be9b9301 100644 --- a/files.json +++ b/files.json @@ -152,6 +152,10 @@ "SHA": "e32ab1c934b747999d04e8a550b97f4647f8b1b43e152de5650d4476bfd1d2e1", "URL": "https://storage.googleapis.com/golang/go1.11.8.linux-amd64.tar.gz" }, + "go1.11.9.linux-amd64.tar.gz": { + "SHA": "e88aa3e39104e3ba6a95a4e05629348b4a1ec82791fb3c941a493ca349730608", + "URL": "https://storage.googleapis.com/golang/go1.11.9.linux-amd64.tar.gz" + }, "go1.11.linux-amd64.tar.gz": { "SHA": "b3fcf280ff86558e0559e185b601c9eade0fd24c900b4c63cd14d1d38613e499", "URL": "https://storage.googleapis.com/golang/go1.11.linux-amd64.tar.gz" @@ -184,6 +188,10 @@ "SHA": "3924819eed16e55114f02d25d03e77c916ec40b7fd15c8acb5838b63135b03df", "URL": "https://storage.googleapis.com/golang/go1.12.3.linux-amd64.tar.gz" }, + "go1.12.4.linux-amd64.tar.gz": { + "SHA": "d7d1f1f88ddfe55840712dc1747f37a790cbcaa448f6c9cf51bbe10aa65442f5", + "URL": "https://storage.googleapis.com/golang/go1.12.4.linux-amd64.tar.gz" + }, "go1.12.linux-amd64.tar.gz": { "SHA": "750a07fef8579ae4839458701f4df690e0b20b8bcce33b437e4df89c451b6f13", "URL": "https://storage.googleapis.com/golang/go1.12.linux-amd64.tar.gz" diff --git a/test/run.sh b/test/run.sh index 2ff74d7d..cfc706a3 100755 --- a/test/run.sh +++ b/test/run.sh @@ -628,14 +628,6 @@ testGovendorGo14WithGOVERSIONOverride() { } testGlideMassageVendor() { - if [ "${IMAGE}" = "heroku/cedar:14" ]; then - echo "!!!" - echo "!!! Skipping this test on heroku/cedar:14" - echo "!!! It fails with gcc errors when compiling mattes/migrate" - echo "!!!" - return 0 - fi - fixture "glide-massage-vendor" env "GO_INSTALL_PACKAGE_SPEC" ". github.com/mattes/migrate"