Deprecate Go 1.17 (#285)

* depricate go 1.17 * add line ending to manifest.yml * change go 1.17 to 1.18 in integration tests
cloudfoundry · Sep 16, 2022 · be29643 · be29643
1 parent da7c48c
commit be29643
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 25 deletions.
diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
 
     - name: Checkout
       uses: actions/checkout@v2
@@ -33,7 +33,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
 
     - name: Checkout
       uses: actions/checkout@v2

diff --git a/manifest.yml b/manifest.yml
@@ -4,10 +4,6 @@ default_versions:
 - name: go
   version: 1.18.x
 dependency_deprecation_dates:
-- version_line: 1.17.x
-  name: go
-  date: 2022-09-10
-  link: https://golang.org/doc/devel/release.html
 - version_line: 1.18.x
   name: go
   date: 2023-03-15
@@ -34,21 +30,13 @@ dependencies:
   source: https://github.com/Masterminds/glide/archive/v0.13.3.tar.gz
   source_sha256: 817dad2f25303d835789c889bf2fac5e141ad2442b9f75da7b164650f0de3fee
 - name: go
-  version: 1.17.12
-  uri: https://buildpacks.cloudfoundry.org/dependencies/go/go_1.17.12_linux_x64_cflinuxfs3_d1fdab7b.tgz
-  sha256: d1fdab7b93fad466ba127594ec12551564b5afc4db28bc3323d6adae304f490b
-  cf_stacks:
-  - cflinuxfs3
-  source: https://dl.google.com/go/go1.17.12.src.tar.gz
-  source_sha256: 0d51b5b3f280c0f01f534598c0219db5878f337da6137a9ee698777413607209
-- name: go
-  version: 1.17.13
-  uri: https://buildpacks.cloudfoundry.org/dependencies/go/go_1.17.13_linux_x64_cflinuxfs3_773f1266.tgz
-  sha256: 773f12667861451dd4dc578be8a251b16ed2675717678bc5870d3912d2bd7146
+  version: 1.18.4
+  uri: https://buildpacks.cloudfoundry.org/dependencies/go/go_1.18.4_linux_x64_cflinuxfs3_baaa1e54.tgz
+  sha256: baaa1e546a6e5a5fc3cb2454e59b75bfe0b250f0bfa3b32a18aad0e2b0f5f716
   cf_stacks:
   - cflinuxfs3
-  source: https://dl.google.com/go/go1.17.13.src.tar.gz
-  source_sha256: a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd
+  source: https://dl.google.com/go/go1.18.4.src.tar.gz
+  source_sha256: 4525aa6b0e3cecb57845f4060a7075aafc9ab752bb7b6b4cf8a212d43078e1e4
 - name: go
   version: 1.18.5
   uri: https://buildpacks.cloudfoundry.org/dependencies/go/go_1.18.5_linux_x64_cflinuxfs3_c96d24dd.tgz

diff --git a/src/go/integration/modules_test.go b/src/go/integration/modules_test.go
@@ -33,7 +33,7 @@ func testModules(platform switchblade.Platform, fixtures string) func(*testing.T
 		it("builds the app with modules", func() {
 			deployment, logs, err := platform.Deploy.
 				WithEnv(map[string]string{
-					"GOVERSION": "go1.17",
+					"GOVERSION": "go1.18",
 				}).
 				Execute(name, filepath.Join(fixtures, "mod", "simple"))
 			Expect(err).NotTo(HaveOccurred())
@@ -47,7 +47,7 @@ func testModules(platform switchblade.Platform, fixtures string) func(*testing.T
 				deployment, logs, err := platform.Deploy.
 					WithEnv(map[string]string{
 						"GO_INSTALL_PACKAGE_SPEC": "github.com/full/path/cmd/app",
-						"GOVERSION":               "go1.17",
+						"GOVERSION":               "go1.18",
 					}).
 					Execute(name, filepath.Join(fixtures, "mod", "install_package_spec", "absolute"))
 				Expect(err).NotTo(HaveOccurred())
@@ -61,7 +61,7 @@ func testModules(platform switchblade.Platform, fixtures string) func(*testing.T
 					deployment, logs, err := platform.Deploy.
 						WithEnv(map[string]string{
 							"GO_INSTALL_PACKAGE_SPEC": "./cmd/app",
-							"GOVERSION":               "go1.17",
+							"GOVERSION":               "go1.18",
 						}).
 						Execute(name, filepath.Join(fixtures, "mod", "install_package_spec", "relative"))
 					Expect(err).NotTo(HaveOccurred())
@@ -77,7 +77,7 @@ func testModules(platform switchblade.Platform, fixtures string) func(*testing.T
 				deployment, logs, err := platform.Deploy.
 					WithEnv(map[string]string{
 						"GOPACKAGENAME": "go-online",
-						"GOVERSION":     "go1.17",
+						"GOVERSION":     "go1.18",
 					}).
 					Execute(name, filepath.Join(fixtures, "mod", "vendored"))
 				Expect(err).NotTo(HaveOccurred())
@@ -91,7 +91,7 @@ func testModules(platform switchblade.Platform, fixtures string) func(*testing.T
 					deployment, logs, err := platform.Deploy.
 						WithEnv(map[string]string{
 							"GO_INSTALL_PACKAGE_SPEC": "github.com/full/path/cmd/app",
-							"GOVERSION":               "go1.17",
+							"GOVERSION":               "go1.18",
 						}).
 						Execute(name, filepath.Join(fixtures, "mod", "install_package_spec", "vendored"))
 					Expect(err).NotTo(HaveOccurred())

diff --git a/src/go/integration/offline_test.go b/src/go/integration/offline_test.go
@@ -128,7 +128,7 @@ func testOffline(platform switchblade.Platform, fixtures string) func(*testing.T
 				deployment, logs, err := platform.Deploy.
 					WithEnv(map[string]string{
 						"GO_INSTALL_PACKAGE_SPEC": "github.com/full/path/cmd/app",
-						"GOVERSION":               "go1.17",
+						"GOVERSION":               "go1.18",
 					}).
 					WithoutInternetAccess().
 					Execute(name, filepath.Join(fixtures, "mod", "install_package_spec", "vendored"))