Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release v2.4.0-rc1 #1972

Merged
merged 4 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN git submodule update --init
RUN go mod download

# Stage 2: Install Lotus binary
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.28.1-devnet AS lotus-test
FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.30.0-rc1-devnet AS lotus-test

# Stage 3: Build the final image
FROM myoung34/github-runner AS curio-github-runner
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
shell: bash

build-all:
runs-on: [self-hosted, docker]
runs-on: ubuntu-latest
needs: [ci-lint]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -227,6 +227,13 @@ jobs:
- name: Install Dependencies
uses: ./.github/actions/install-deps

- name: Install FFI
env:
GITHUB_TOKEN: ${{ github.token }}
run: |
make deps
shell: bash

- name: Install goimports
run: go install golang.org/x/tools/cmd/goimports
shell: bash
Expand Down Expand Up @@ -257,6 +264,13 @@ jobs:
- name: Install Dependencies
uses: ./.github/actions/install-deps

- name: Install FFI
env:
GITHUB_TOKEN: ${{ github.token }}
run: |
make deps
shell: bash

- name: Install goimports
run: go install golang.org/x/tools/cmd/goimports
shell: bash
Expand Down
53 changes: 3 additions & 50 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ dist-clean:
git submodule deinit --all -f
.PHONY: dist-clean

gen: cfgdoc-gen api-gen
gen: cfgdoc-gen api-gen docsgen
.PHONY: gen

api-gen:
Expand Down Expand Up @@ -217,22 +217,9 @@ docsgen-openrpc-boost: docsgen-openrpc-bin

## DOCKER IMAGES
docker_user?=filecoin
lotus_version?=v1.27.0
lotus_version?=v1.30.0-rc1
ffi_from_source?=0
build_lotus?=0
build_boost?=1
boost_version?=v2.3.0-rc2
ifeq ($(build_boost),1)
#v1: build boost images currently checked out branch
boost_build_cmd=docker/boost
booster_http_build_cmd=docker/booster-http
booster_bitswap_build_cmd=docker/booster-bitswap
else
# v2: pull images from the github repo
boost_build_cmd=pull/boost retag/boost
booster_http_build_cmd=pull/booster-http retag/booster-http
booster_bitswap_build_cmd=pull/booster-bitswap retag/booster-bitswap
endif
ifeq ($(build_lotus),1)
# v1: building lotus image with provided lotus version
lotus_info_msg=!!! building lotus base image from github: branch/tag $(lotus_version) !!!
Expand Down Expand Up @@ -263,30 +250,6 @@ docker/lotus-all-in-one: info/lotus-all-in-one | $(lotus_src_dir)
-t $(lotus_base_image) --build-arg GOFLAGS=-tags=debug .
.PHONY: docker/lotus-all-in-one

pull/boost:
docker pull ghcr.io/filecoin-project/boost:boost-dev-$(boost_version)
.PHONY: pull/boost

pull/booster-http:
docker pull ghcr.io/filecoin-project/boost:boost-http-dev-$(boost_version)
.PHONY: pull/boost

pull/booster-bitswap:
docker pull ghcr.io/filecoin-project/boost:boost-bitswap-dev-$(boost_version)
.PHONY: pull/boost

retag/boost:
docker tag ghcr.io/filecoin-project/boost:boost-dev-$(boost_version) $(docker_user)/boost-dev:dev
.PHONY: retag/boost

retag/booster-http:
docker tag ghcr.io/filecoin-project/boost:boost-http-dev-$(boost_version) $(docker_user)/booster-http-dev:dev
.PHONY: retag/booster-http

retag/booster-bitswap:
docker tag ghcr.io/filecoin-project/boost:boost-bitswap-dev-$(boost_version) $(docker_user)/booster-bitswap-dev:dev
.PHONY: retag/booster-bitswap

# boost-client main
docker/mainnet/boost-client: build/.update-modules
DOCKER_BUILDKIT=1 $(docker_build_cmd) \
Expand Down Expand Up @@ -318,20 +281,10 @@ docker/yugabytedb:
-f docker/Dockerfile.yugabyte .
.PHONY: docker/booster-http
.PHONY: docker/booster-bitswap
docker/all: $(lotus_build_cmd) $(boost_build_cmd) $(booster_http_build_cmd) $(booster_bitswap_build_cmd) \
docker/all: $(lotus_build_cmd) docker/boost docker/booster-http docker/booster-bitswap \
docker/lotus docker/lotus-miner docker/yugabytedb
.PHONY: docker/all

### To allow devs to pull individual images. Require build_boost=0 and boost_version to be supplied
docker/get-boost: $(boost_build_cmd)
.PHONY: docker/get-boost

docker/get-booster-http: $(booster_http_build_cmd)
.PHONY: docker/get-booster-http

docker/get-booster-bitswap: $(booster_bitswap_build_cmd)
.PHONY: docker/get-booster-http

test-lid:
cd ./extern/boostd-data && ARCH=$(ARCH) docker-compose up --build --exit-code-from go-tests

Expand Down
Binary file modified build/openrpc/boost.json.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion build/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func BuildTypeString() string {
}
}

const BuildVersion = "2.3.0"
const BuildVersion = "2.4.0-rc1"

func UserVersion() string {
return BuildVersion + BuildTypeString() + CurrentCommit
Expand Down
Loading