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

merge: merge a head #216

Merged
merged 17 commits into from
Jul 18, 2022
Merged

merge: merge a head #216

merged 17 commits into from
Jul 18, 2022

Conversation

zl03jsj
Copy link
Contributor

@zl03jsj zl03jsj commented Jul 18, 2022

同时存在mainmaster分支, 将把master作为主分支, 所以, 先把main合并到master, 随后删除main

LinZexiao and others added 17 commits June 9, 2022 17:08
* add: dockerfile &docker dir

* feat: add publish docker image action

* fix: change action trigger to making tag

* chore: rm the test workflow of docker

* style: add blank line to the end of the file

* style:add reture to the end of file
)

* fix: change to build image from local repo

* fix: get BUILD_DOCKER_PROXY var from env
* feat: load builtin actors from bundle

* feat: use ~/.venus-messager store files

* fix: Simplify the configuration

* cmd: hidden --config flag

* chore: upgrade venus & gateway & auth

* chore: Remove the dependency on golang.org/x/xerrors

* build: bump version to v1.6.0-rc1
* upgrade venus

* upgrade gateway

* feat: load builtin actors from bundle

* feat: use ~/.venus-messager store files

* chore: upgrade venus

* fix: Simplify the configuration

* cmd: hidden --config flag

* chore: upgrade venus & gateway & auth

* chore: Remove the dependency on golang.org/x/xerrors

* build: bump version to v1.6.0-rc1

* cmd: rmeove --sqlite-file flag

* fix: remove messager.toml

* doc: update README.md

* cmd: Fix incorrect configuration loading

* cmd: fix actor code not registed

* chore: upgrade gateway & venus

* chore: upgrade venus & venus-auth

* doc: update READMD.md
* fix: upgrade venus & simplified MessagePaser logic

* docs: update README.md

* chore: upgrade venus

* chore: upgrade venus & venus-gateway

* chore: use go 1.17 in go.mod

* build: bump version to v1.6.0-rc2
* chore: upgrade venus & auth & gateway

* chore: bump version to v1.6.0
* docs: migrate from venus-docs
* feat: add gas over premium
* enable golang-ci-lint checks on git action
* cmd: add batch replace cmd & upgrade venus
@zl03jsj zl03jsj requested a review from diwufeiwen July 18, 2022 06:36
Copy link
Contributor

@diwufeiwen diwufeiwen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@diwufeiwen diwufeiwen merged commit c6e9842 into master Jul 18, 2022
zl03jsj added a commit that referenced this pull request Jul 18, 2022
@zl03jsj zl03jsj deleted the main branch July 18, 2022 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants