Merge branch 'main' into add_toolchain_version

cloudfoundry · Jul 10, 2024 · 4d1fff8 · 4d1fff8
2 parents 138ae13 + a4ca0cb
commit 4d1fff8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/win/windows-installer-v8-x64.iss b/.github/win/windows-installer-v8-x64.iss
@@ -5,8 +5,8 @@ AppName=Cloud Foundry CLI
 AppVersion=VERSION
 AppVerName=Cloud Foundry CLI version VERSION
 AppPublisher=Cloud Foundry Foundation
-ArchitecturesInstallIn64BitMode=x64 ia64
-ArchitecturesAllowed=x64 ia64
+ArchitecturesInstallIn64BitMode=x64compatible
+ArchitecturesAllowed=x64compatible
 PrivilegesRequired=none
 DefaultDirName={pf}\Cloud Foundry
 SetupIconFile=cf.ico

diff --git a/cf/api/buildpack_bits.go b/cf/api/buildpack_bits.go
@@ -108,6 +108,7 @@ func (repo CloudControllerBuildpackBitsRepository) CreateBuildpackZipFile(buildp
 			if err != nil {
 				return nil, "", fmt.Errorf("%s: %s", T("Couldn't open buildpack file"), err.Error())
 			}
+			defer specifiedFile.Close()
 			err = normalizeBuildpackArchive(specifiedFile, zipFileToUpload)
 			if err != nil {
 				return nil, "", zipErrorHelper(err)