good morning!!!!

Skip to content
Snippets Groups Projects
Unverified Commit 29d9690a authored by Victor Castell's avatar Victor Castell Committed by GitHub
Browse files

Build and run the new CLI (#318)

* Build and run the new CLI
parent c9cb5a76
Branches
Tags
No related merge requests found
...@@ -7,7 +7,7 @@ release: ...@@ -7,7 +7,7 @@ release:
builds: builds:
- id: darwin-amd64 - id: darwin-amd64
main: ./cmd/geth main: ./cmd/cli
binary: bor binary: bor
goos: goos:
- darwin - darwin
...@@ -22,7 +22,7 @@ builds: ...@@ -22,7 +22,7 @@ builds:
-s -w -s -w
- id: darwin-arm64 - id: darwin-arm64
main: ./cmd/geth main: ./cmd/cli
binary: bor binary: bor
goos: goos:
- darwin - darwin
...@@ -37,7 +37,7 @@ builds: ...@@ -37,7 +37,7 @@ builds:
-s -w -s -w
- id: linux-amd64 - id: linux-amd64
main: ./cmd/geth main: ./cmd/cli
binary: bor binary: bor
goos: goos:
- linux - linux
...@@ -53,7 +53,7 @@ builds: ...@@ -53,7 +53,7 @@ builds:
-s -w -extldflags "-static" -s -w -extldflags "-static"
- id: linux-arm64 - id: linux-arm64
main: ./cmd/geth main: ./cmd/cli
binary: bor binary: bor
goos: goos:
- linux - linux
......
...@@ -14,16 +14,8 @@ GORUN = env GO111MODULE=on go run ...@@ -14,16 +14,8 @@ GORUN = env GO111MODULE=on go run
GOPATH = $(shell go env GOPATH) GOPATH = $(shell go env GOPATH)
bor: bor:
$(GORUN) build/ci.go install ./cmd/geth
mkdir -p $(GOPATH)/bin/
cp $(GOBIN)/geth $(GOBIN)/bor
cp $(GOBIN)/* $(GOPATH)/bin/
bor-all:
$(GORUN) build/ci.go install
mkdir -p $(GOPATH)/bin/ mkdir -p $(GOPATH)/bin/
cp $(GOBIN)/geth $(GOBIN)/bor go build -o $(GOBIN)/bor ./cmd/cli/main.go
cp $(GOBIN)/* $(GOPATH)/bin/
protoc: protoc:
protoc --go_out=. --go-grpc_out=. ./internal/cli/server/proto/*.proto protoc --go_out=. --go-grpc_out=. ./internal/cli/server/proto/*.proto
...@@ -164,7 +156,7 @@ geth-windows-amd64: ...@@ -164,7 +156,7 @@ geth-windows-amd64:
@ls -ld $(GOBIN)/geth-windows-* | grep amd64 @ls -ld $(GOBIN)/geth-windows-* | grep amd64
PACKAGE_NAME := github.com/maticnetwork/bor PACKAGE_NAME := github.com/maticnetwork/bor
GOLANG_CROSS_VERSION ?= v1.17.2 GOLANG_CROSS_VERSION ?= v1.17.6
.PHONY: release-dry-run .PHONY: release-dry-run
release-dry-run: release-dry-run:
......
...@@ -63,12 +63,6 @@ them using your favourite package manager. Once the dependencies are installed, ...@@ -63,12 +63,6 @@ them using your favourite package manager. Once the dependencies are installed,
$ make bor $ make bor
``` ```
- or, to build the full suite of utilities:
```shell
$ make bor-all
```
### Make awesome changes! ### Make awesome changes!
1. Create new branch for your changes 1. Create new branch for your changes
...@@ -113,12 +107,6 @@ them using your favourite package manager. Once the dependencies are installed, ...@@ -113,12 +107,6 @@ them using your favourite package manager. Once the dependencies are installed,
<hr style="margin-top: 3em; margin-bottom: 3em;"> <hr style="margin-top: 3em; margin-bottom: 3em;">
Build the beta client:
```shell
go build -o bor-beta command/*.go
```
## License ## License
The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the
......
...@@ -6,19 +6,19 @@ ...@@ -6,19 +6,19 @@
[Service] [Service]
Restart=on-failure Restart=on-failure
RestartSec=5s RestartSec=5s
ExecStart=/usr/local/bin/bor \ ExecStart=/usr/local/bin/bor server \
--bor-mumbai \ -chain=mumbai \
# --bor-mainnet \ # -chain=mainnet \
--datadir /var/lib/bor/data \ -datadir /var/lib/bor/data \
--bootnodes "enode://0cb82b395094ee4a2915e9714894627de9ed8498fb881cec6db7c65e8b9a5bd7f2f25cc84e71e89d0947e51c76e85d0847de848c7782b13c0255247a6758178c@44.232.55.71:30303,enode://88116f4295f5a31538ae409e4d44ad40d22e44ee9342869e7d68bdec55b0f83c1530355ce8b41fbec0928a7d75a5745d528450d30aec92066ab6ba1ee351d710@159.203.9.164:30303" -bootnodes "enode://0cb82b395094ee4a2915e9714894627de9ed8498fb881cec6db7c65e8b9a5bd7f2f25cc84e71e89d0947e51c76e85d0847de848c7782b13c0255247a6758178c@44.232.55.71:30303,enode://88116f4295f5a31538ae409e4d44ad40d22e44ee9342869e7d68bdec55b0f83c1530355ce8b41fbec0928a7d75a5745d528450d30aec92066ab6ba1ee351d710@159.203.9.164:30303"
# Validator params # Validator params
# Uncomment and configure the following lines in case you run a validator # Uncomment and configure the following lines in case you run a validator
# --keystore /var/lib/bor/keystore \ # -keystore /var/lib/bor/keystore \
# --unlock [VALIDATOR ADDRESS] \ # -unlock [VALIDATOR ADDRESS] \
# --password /var/lib/bor/password.txt \ # -password /var/lib/bor/password.txt \
# --allow-insecure-unlock \ # -allow-insecure-unlock \
# --nodiscover --maxpeers 1 \ # -nodiscover -maxpeers 1 \
# --mine # -mine
Type=simple Type=simple
User=root User=root
KillSignal=SIGINT KillSignal=SIGINT
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment