Skip to content

Commit e67fcd8

Browse files
authored
release v2.4.0-rc1 (#1972)
* release v2.4.0-rc1 * update ffi * fix tests * lotus v1.30-rc2
1 parent f97c52f commit e67fcd8

File tree

10 files changed

+306
-293
lines changed

10 files changed

+306
-293
lines changed

.github/image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -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.28.1-devnet AS lotus-test
26+
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.30.0-rc1-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

+15-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
shell: bash
3939

4040
build-all:
41-
runs-on: [self-hosted, docker]
41+
runs-on: ubuntu-latest
4242
needs: [ci-lint]
4343
steps:
4444
- uses: actions/checkout@v4
@@ -227,6 +227,13 @@ jobs:
227227
- name: Install Dependencies
228228
uses: ./.github/actions/install-deps
229229

230+
- name: Install FFI
231+
env:
232+
GITHUB_TOKEN: ${{ github.token }}
233+
run: |
234+
make deps
235+
shell: bash
236+
230237
- name: Install goimports
231238
run: go install golang.org/x/tools/cmd/goimports
232239
shell: bash
@@ -257,6 +264,13 @@ jobs:
257264
- name: Install Dependencies
258265
uses: ./.github/actions/install-deps
259266

267+
- name: Install FFI
268+
env:
269+
GITHUB_TOKEN: ${{ github.token }}
270+
run: |
271+
make deps
272+
shell: bash
273+
260274
- name: Install goimports
261275
run: go install golang.org/x/tools/cmd/goimports
262276
shell: bash

Makefile

+3-50
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ dist-clean:
178178
git submodule deinit --all -f
179179
.PHONY: dist-clean
180180

181-
gen: cfgdoc-gen api-gen
181+
gen: cfgdoc-gen api-gen docsgen
182182
.PHONY: gen
183183

184184
api-gen:
@@ -217,22 +217,9 @@ docsgen-openrpc-boost: docsgen-openrpc-bin
217217

218218
## DOCKER IMAGES
219219
docker_user?=filecoin
220-
lotus_version?=v1.27.0
220+
lotus_version?=v1.30.0-rc1
221221
ffi_from_source?=0
222222
build_lotus?=0
223-
build_boost?=1
224-
boost_version?=v2.3.0-rc2
225-
ifeq ($(build_boost),1)
226-
#v1: build boost images currently checked out branch
227-
boost_build_cmd=docker/boost
228-
booster_http_build_cmd=docker/booster-http
229-
booster_bitswap_build_cmd=docker/booster-bitswap
230-
else
231-
# v2: pull images from the github repo
232-
boost_build_cmd=pull/boost retag/boost
233-
booster_http_build_cmd=pull/booster-http retag/booster-http
234-
booster_bitswap_build_cmd=pull/booster-bitswap retag/booster-bitswap
235-
endif
236223
ifeq ($(build_lotus),1)
237224
# v1: building lotus image with provided lotus version
238225
lotus_info_msg=!!! building lotus base image from github: branch/tag $(lotus_version) !!!
@@ -263,30 +250,6 @@ docker/lotus-all-in-one: info/lotus-all-in-one | $(lotus_src_dir)
263250
-t $(lotus_base_image) --build-arg GOFLAGS=-tags=debug .
264251
.PHONY: docker/lotus-all-in-one
265252

266-
pull/boost:
267-
docker pull ghcr.io/filecoin-project/boost:boost-dev-$(boost_version)
268-
.PHONY: pull/boost
269-
270-
pull/booster-http:
271-
docker pull ghcr.io/filecoin-project/boost:boost-http-dev-$(boost_version)
272-
.PHONY: pull/boost
273-
274-
pull/booster-bitswap:
275-
docker pull ghcr.io/filecoin-project/boost:boost-bitswap-dev-$(boost_version)
276-
.PHONY: pull/boost
277-
278-
retag/boost:
279-
docker tag ghcr.io/filecoin-project/boost:boost-dev-$(boost_version) $(docker_user)/boost-dev:dev
280-
.PHONY: retag/boost
281-
282-
retag/booster-http:
283-
docker tag ghcr.io/filecoin-project/boost:boost-http-dev-$(boost_version) $(docker_user)/booster-http-dev:dev
284-
.PHONY: retag/booster-http
285-
286-
retag/booster-bitswap:
287-
docker tag ghcr.io/filecoin-project/boost:boost-bitswap-dev-$(boost_version) $(docker_user)/booster-bitswap-dev:dev
288-
.PHONY: retag/booster-bitswap
289-
290253
# boost-client main
291254
docker/mainnet/boost-client: build/.update-modules
292255
DOCKER_BUILDKIT=1 $(docker_build_cmd) \
@@ -318,20 +281,10 @@ docker/yugabytedb:
318281
-f docker/Dockerfile.yugabyte .
319282
.PHONY: docker/booster-http
320283
.PHONY: docker/booster-bitswap
321-
docker/all: $(lotus_build_cmd) $(boost_build_cmd) $(booster_http_build_cmd) $(booster_bitswap_build_cmd) \
284+
docker/all: $(lotus_build_cmd) docker/boost docker/booster-http docker/booster-bitswap \
322285
docker/lotus docker/lotus-miner docker/yugabytedb
323286
.PHONY: docker/all
324287

325-
### To allow devs to pull individual images. Require build_boost=0 and boost_version to be supplied
326-
docker/get-boost: $(boost_build_cmd)
327-
.PHONY: docker/get-boost
328-
329-
docker/get-booster-http: $(booster_http_build_cmd)
330-
.PHONY: docker/get-booster-http
331-
332-
docker/get-booster-bitswap: $(booster_bitswap_build_cmd)
333-
.PHONY: docker/get-booster-http
334-
335288
test-lid:
336289
cd ./extern/boostd-data && ARCH=$(ARCH) docker-compose up --build --exit-code-from go-tests
337290

build/openrpc/boost.json.gz

4 Bytes
Binary file not shown.

build/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func BuildTypeString() string {
3131
}
3232
}
3333

34-
const BuildVersion = "2.3.0"
34+
const BuildVersion = "2.4.0-rc1"
3535

3636
func UserVersion() string {
3737
return BuildVersion + BuildTypeString() + CurrentCommit

0 commit comments

Comments
 (0)