Skip to content

Commit 4f7f3e9

Browse files
committed
add go 1.22 build
Signed-off-by: Lize Cai <[email protected]>
1 parent c280956 commit 4f7f3e9

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
go-version:
14+
- 1.22.x
1415
- 1.20.x
1516
- 1.19.x
1617
os:
@@ -32,6 +33,7 @@ jobs:
3233
strategy:
3334
matrix:
3435
go-version:
36+
- 1.22.x
3537
- 1.20.x
3638
- 1.19.x
3739
os:
@@ -67,6 +69,7 @@ jobs:
6769
strategy:
6870
matrix:
6971
go-version:
72+
- 1.22.x
7073
- 1.20.x
7174
os:
7275
- ubuntu

.github/workflows/goreleaser.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v2
1212
- uses: actions/setup-go@v2
1313
with:
14-
go-version: 1.20.x
14+
go-version: 1.22.x
1515
- run: make test_without_race
1616
env:
1717
S5CMD_ACCESS_KEY_ID: ${{ secrets.S5CMD_GCS_ACCESS_KEY_ID }}
@@ -34,7 +34,7 @@ jobs:
3434
name: Set up Go
3535
uses: actions/setup-go@v2
3636
with:
37-
go-version: '1.20'
37+
go-version: '1.22'
3838
-
3939
name: Run GoReleaser
4040
uses: goreleaser/goreleaser-action@v2

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM golang:1.20-alpine as build
1+
FROM golang:1.22-alpine AS build
22
COPY . /s5cmd/
33
RUN apk add --no-cache git make && \
44
cd /s5cmd/ && \
55
CGO_ENABLED=0 make build
66

7-
FROM alpine:3.18
7+
FROM alpine:3.20
88
COPY --from=build /s5cmd/s5cmd .
99
WORKDIR /aws
1010
ENTRYPOINT ["/s5cmd"]

storage/s3.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ func (s *S3) doDelete(ctx context.Context, chunk chunk, resultch chan *Object) {
10491049

10501050
resultch <- &Object{
10511051
URL: url,
1052-
Err: fmt.Errorf(aws.StringValue(e.Message)),
1052+
Err: fmt.Errorf("%v", aws.StringValue(e.Message)),
10531053
}
10541054
}
10551055
}

0 commit comments

Comments
 (0)