Skip to content

Commit dfd1817

Browse files
LexLuthrrvagg
authored andcommitted
release v1.27.0 (#627)
* release v1.27.0 * fix lint issues * docker go version bump
1 parent 95a7456 commit dfd1817

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+389
-338
lines changed

.github/image/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## This image is used to github action runner for this repo
22
# Use the official Golang image as the base image
3-
FROM golang:1.23-bullseye AS builder
3+
FROM golang:1.24-bullseye AS builder
44

55
# Set the working directory inside the container
66
WORKDIR /app
@@ -23,7 +23,7 @@ RUN git submodule update --init
2323
RUN go mod download
2424

2525
# Stage 2: Install Lotus binary
26-
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.33.1-devnet AS lotus-test
26+
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.34.0-rc2-devnet AS lotus-test
2727

2828
# Stage 3: Build the final image
2929
FROM myoung34/github-runner AS curio-github-runner

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- '**'
1010

1111
env:
12-
GO_VERSION: 1.23
12+
GO_VERSION: 1.24
1313

1414
jobs:
1515
ci-lint:
@@ -257,7 +257,7 @@ jobs:
257257

258258
- name: Install golangci-lint
259259
run: |
260-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.1
260+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.4.0
261261
shell: bash
262262

263263
- name: Lint

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#####################################
22
ARG LOTUS_TEST_IMAGE=curio/lotus-all-in-one:latest
33
FROM ${LOTUS_TEST_IMAGE} AS lotus-test
4-
FROM golang:1.23-bullseye AS curio-builder
4+
FROM golang:1.24-bullseye AS curio-builder
55
LABEL Maintainer="Curio Development Team"
66

77
RUN apt-get update && apt-get install -y ca-certificates build-essential clang ocl-icd-opencl-dev ocl-icd-libopencl1 jq libhwloc-dev
@@ -48,7 +48,7 @@ ARG CURIO_TAGS=""
4848
RUN make build
4949

5050
####################################
51-
FROM golang:1.23-bullseye AS piece-server-builder
51+
FROM golang:1.24-bullseye AS piece-server-builder
5252

5353
RUN go install github.com/ipld/go-car/cmd/car@latest \
5454
&& cp $GOPATH/bin/car /usr/local/bin/

GO_VERSION_MIN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.23
1+
1.24

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ build_lotus?=0
279279
curio_docker_user?=curio
280280
curio_base_image=$(curio_docker_user)/curio-all-in-one:latest-debug
281281
ffi_from_source?=0
282-
lotus_version?=v1.33.1
282+
lotus_version?=v1.34.0-rc2
283283

284284
ifeq ($(build_lotus),1)
285285
# v1: building lotus image with provided lotus version

cmd/curio/cli.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,7 @@ var waitApiCmd = &cli.Command{
229229
ctx := reqcontext.ReqContext(cctx)
230230
ctx, cancel := context.WithTimeout(ctx, cctx.Duration("timeout"))
231231
defer cancel()
232-
for {
233-
if ctx.Err() != nil {
234-
break
235-
}
232+
for ctx.Err() == nil {
236233

237234
api, closer, err := rpc.GetCurioAPI(cctx)
238235
if err != nil {

cmd/curio/debug-ipni.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ var testDebugIpniChunks = &cli.Command{
2626
if err != nil {
2727
return xerrors.Errorf("opening file: %w", err)
2828
}
29-
defer f.Close()
29+
defer func() {
30+
_ = f.Close()
31+
}()
3032

3133
opts := []carv2.Option{carv2.ZeroLengthSectionAsEOF(true)}
3234
blockReader, err := carv2.NewBlockReader(bufio.NewReaderSize(f, 4<<20), opts...)
@@ -36,7 +38,7 @@ var testDebugIpniChunks = &cli.Command{
3638

3739
blockMetadata, err := blockReader.SkipNext()
3840
for err == nil {
39-
if err := ck.Accept(blockMetadata.Cid.Hash(), int64(blockMetadata.Offset), blockMetadata.Size+40); err != nil {
41+
if err := ck.Accept(blockMetadata.Hash(), int64(blockMetadata.Offset), blockMetadata.Size+40); err != nil {
4042
return xerrors.Errorf("accepting block: %w", err)
4143
}
4244

cmd/curio/debug-snsvc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ func getClientStateAction(cctx *cli.Context) error {
590590
fmt.Printf("VoucherRedeemed: %s\n", types.FIL(clientState.VoucherRedeemed).String())
591591
fmt.Printf("LastNonce: %d\n", clientState.LastNonce)
592592
fmt.Printf("WithdrawAmount: %s\n", types.FIL(clientState.WithdrawAmount).String())
593-
ts := clientState.WithdrawTimestamp.Int.Uint64()
593+
ts := clientState.WithdrawTimestamp.Uint64()
594594
wt := time.Unix(int64(ts), 0)
595595
diff := time.Until(wt)
596596
var diffStr string

cmd/curio/guidedsetup/guidedsetup.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"github.com/filecoin-project/curio/api"
3838
"github.com/filecoin-project/curio/build"
3939
"github.com/filecoin-project/curio/cmd/curio/internal/translations"
40-
_ "github.com/filecoin-project/curio/cmd/curio/internal/translations"
4140
"github.com/filecoin-project/curio/deps"
4241
"github.com/filecoin-project/curio/deps/config"
4342
"github.com/filecoin-project/curio/harmony/harmonydb"
@@ -163,9 +162,10 @@ func newOrMigrate(d *MigrationData) {
163162
d.say(notice, "Aborting remaining steps.", err.Error())
164163
os.Exit(1)
165164
}
166-
if i == 1 {
165+
switch i {
166+
case 1:
167167
d.init = true
168-
} else if i == 2 {
168+
case 2:
169169
d.nonSP = true
170170
}
171171
}

cmd/curio/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func runApp(app *cli.App) {
240240
if os.Getenv("LOTUS_DEV") != "" {
241241
log.Warnf("%+v", err)
242242
} else {
243-
fmt.Fprintf(os.Stderr, "ERROR: %s\n\n", err) // nolint:errcheck
243+
_, _ = fmt.Fprintf(os.Stderr, "ERROR: %s\n\n", err) // nolint:errcheck
244244
}
245245

246246
var phe *PrintHelpErr

0 commit comments

Comments
 (0)