From adaf6b16c52598487978c8ec6a3f0326c050ed0a Mon Sep 17 00:00:00 2001 From: Greg Weresch Date: Tue, 9 Jul 2024 14:43:27 -0400 Subject: [PATCH 1/2] Update inno setup x64 flag to x64compatible (#3006) Inno Setup is used to create installers for release, and it no longer supports the ia64 flag and recommends x64compatible instead. See https://jrsoftware.org/ishelp/index.php?topic=setup_architecturesinstallin64bitmode --- .github/win/windows-installer-v8-x64.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/win/windows-installer-v8-x64.iss b/.github/win/windows-installer-v8-x64.iss index c11acb04151..29f8f652d03 100644 --- 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 From a4ca0cbdcaf4dc87692ef2e9810af68948f63038 Mon Sep 17 00:00:00 2001 From: Sam Gunaratne <385176+Samze@users.noreply.github.com> Date: Wed, 10 Jul 2024 08:46:13 -0600 Subject: [PATCH 2/2] Add missing file close (#2998) --- cf/api/buildpack_bits.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cf/api/buildpack_bits.go b/cf/api/buildpack_bits.go index a3dd4416071..da6efd357eb 100644 --- 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)