Skip to content

Commit

Permalink
bump: golang version to fix CVE-2024-24790 and CVE-2024-34156 (#1562)
Browse files Browse the repository at this point in the history
Signed-off-by: Billy Zha <[email protected]>
  • Loading branch information
qweeah authored Dec 5, 2024
1 parent dcef719 commit 001980e
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: ['1.22']
go-version: ['1.23']
fail-fast: true
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: setup go environment
uses: actions/setup-go@v5
with:
go-version: '1.22.3'
go-version: '1.23.1'
- name: run goreleaser
uses: goreleaser/goreleaser-action@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22.3-alpine as builder
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23.1-alpine as builder
ARG TARGETPLATFORM
RUN apk add git make
ENV ORASPKG /oras
Expand Down
4 changes: 2 additions & 2 deletions cmd/oras/internal/display/status/print_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.
package status

import (
"fmt"
"errors"
"strconv"
"strings"
"testing"
Expand All @@ -33,7 +33,7 @@ func (mw *mockWriter) Write(p []byte) (n int, err error) {
return len(string(p)), nil
}
mw.errorCount++
return 0, fmt.Errorf("Boom: " + string(p))
return 0, errors.New("Boom: " + string(p))
}

func (mw *mockWriter) String() string {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module oras.land/oras

go 1.22.0
go 1.23.0

require (
github.com/Masterminds/sprig/v3 v3.2.3
Expand Down
2 changes: 1 addition & 1 deletion snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ parts:
- on amd64 to {ARCH}:
- TARGET_ARCH: "{ARCH}"
build-snaps:
- go/1.22/stable
- go/1.23/stable
build-packages:
- make
stage-packages:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module oras.land/oras/test/e2e

go 1.22.0
go 1.23.0

require (
github.com/onsi/ginkgo/v2 v2.19.0
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.22.0
go 1.23.0

use (
.
Expand Down

0 comments on commit 001980e

Please sign in to comment.