Skip to content

Commit

Permalink
Merge pull request #216 from blackpiglet/prepare_v1.11.1
Browse files Browse the repository at this point in the history
Prepare for v1.11.1-rc.1.
  • Loading branch information
Lyndon-Li authored Dec 24, 2024
2 parents 4eef39e + 6cde388 commit eff7887
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.22.8'
go-version: '1.22.10'
id: go

- name: Check out the code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.22.8'
go-version: '1.22.10'
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=$BUILDPLATFORM golang:1.22.8-bookworm AS build
FROM --platform=$BUILDPLATFORM golang:1.22.10-bookworm AS build

ARG TARGETOS
ARG TARGETARCH
Expand Down
10 changes: 10 additions & 0 deletions changelogs/CHANGELOG-1.11.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# v1.11.1

## All changes

* Bump golang.org/x/crypto package version to v0.31.0 to fix CVEs. (#212, @blackpiglet)
* Fix the issue pushing image to GCR. (#211, @reasonerjt)


# v1.11.0

## All changes

* Bump depending velero version to latest main commit. (#195, @blackpiglet)
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
github.com/vmware-tanzu/velero v1.15.0
github.com/vmware-tanzu/velero v1.15.1-rc.1
golang.org/x/oauth2 v0.19.0
google.golang.org/api v0.172.0
k8s.io/api v0.29.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/vmware-tanzu/velero v1.15.0 h1:+S/lNSDwQqlROGWfmNuZnnabopGmco978COIt3AP09c=
github.com/vmware-tanzu/velero v1.15.0/go.mod h1:28VhzPJRBo91GBRkgs4Ird0fx2vCpepBWmhF+5Pn/WQ=
github.com/vmware-tanzu/velero v1.15.1-rc.1 h1:riVx9qbpbLYjXA6LwH7xJMIjsF53YKcEQLOA4RxMxRE=
github.com/vmware-tanzu/velero v1.15.1-rc.1/go.mod h1:bZbnBC9OcwXfsovU0uCHwPlbm3ba8N9fwvBkwnU2vls=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand Down

0 comments on commit eff7887

Please sign in to comment.