Merge branch 'v8' into dependabot/go_modules/v8/golang.org/x/term-0.22.0

cloudfoundry · Jul 10, 2024 · ddd76b2 · ddd76b2
2 parents e233233 + f866b6d
commit ddd76b2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 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/.github/workflows/release-update-repos.yml b/.github/workflows/release-update-repos.yml
@@ -589,7 +589,7 @@ jobs:
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Build and export to Docker locally
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: docker
         load: true
@@ -636,15 +636,15 @@ jobs:
 
     - name: Push image if its from v8
       if: ${{ env.LATEST_DOCKER }} == v8
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: docker
         push: true
         tags: cloudfoundry/cli:${{ env.VERSION_BUILD }}, cloudfoundry/cli:latest
 
     - name: Push image if its from v7
       if: ${{ env.LATEST_DOCKER }} == v7
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: docker
         push: true

diff --git a/BUILD_VERSION b/BUILD_VERSION
@@ -1 +1 @@
-8.7.10
+8.7.11
diff --git a/build_data.yml b/build_data.yml
@@ -1,2 +1,2 @@
-build-version: 8.7.10
+build-version: 8.7.11
 capi-version-min: v16.11.0
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)

diff --git a/go.mod b/go.mod
@@ -39,7 +39,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec
-	golang.org/x/crypto v0.23.0
+	golang.org/x/crypto v0.25.0
 	golang.org/x/net v0.25.0
 	golang.org/x/term v0.22.0
 	golang.org/x/text v0.16.0

diff --git a/go.sum b/go.sum
@@ -261,8 +261,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
+golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=