Skip to content

Commit f68965a

Browse files
unclezorounclezoro
authored
Merge pull request #1025 from bnb-chain/develop
[R4R] Release v1.1.12
2 parents de4abf9 + 09dfd2f commit f68965a

File tree

723 files changed

+47229
-16501
lines changed

Some content is hidden

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

723 files changed

+47229
-16501
lines changed

‎.github/generate_change_log.sh‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ TESTNET_ZIP_SUM="$(checksum ./testnet.zip)"
2424
LINUX_BIN_SUM="$(checksum ./linux/geth)"
2525
MAC_BIN_SUM="$(checksum ./macos/geth)"
2626
WINDOWS_BIN_SUM="$(checksum ./windows/geth.exe)"
27-
ARM5_BIN_SUM="$(checksum ./arm5/geth-linux-arm-5)"
28-
ARM6_BIN_SUM="$(checksum ./arm6/geth-linux-arm-6)"
29-
ARM7_BIN_SUM="$(checksum ./arm7/geth-linux-arm-7)"
30-
ARM64_BIN_SUM="$(checksum ./arm64/geth-linux-arm64)"
3127
OUTPUT=$(cat <<-END
3228
## Changelog\n
3329
${CHANGE_LOG}\n
@@ -39,10 +35,6 @@ ${CHANGE_LOG}\n
3935
| geth_linux | ${LINUX_BIN_SUM} |\n
4036
| geth_mac | ${MAC_BIN_SUM} |\n
4137
| geth_windows | ${WINDOWS_BIN_SUM} |\n
42-
| geth_linux_arm5 | ${ARM5_BIN_SUM} |\n
43-
| geth_linux_arm6 | ${ARM6_BIN_SUM} |\n
44-
| geth_linux_arm7 | ${ARM7_BIN_SUM} |\n
45-
| geth_linux_arm64 | ${ARM64_BIN_SUM} |\n
4638
END
4739
)
4840

‎.github/release.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
MAINNET_FILE_URL="https://github.com/binance-chain/bsc/releases/download/v1.1.8/mainnet.zip"
2-
TESTNET_FILE_URL="https://github.com/binance-chain/bsc/releases/download/v1.1.8/testnet.zip"
1+
MAINNET_FILE_URL="https://github.com/binance-chain/bsc/releases/latest/download/mainnet.zip"
2+
TESTNET_FILE_URL="https://github.com/binance-chain/bsc/releases/latest/download/testnet.zip"

‎.github/workflows/build-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
unit-test:
1616
strategy:
1717
matrix:
18-
go-version: [1.16.x]
18+
go-version: [1.17.x]
1919
os: [ubuntu-18.04]
2020
runs-on: ${{ matrix.os }}
2121
steps:

‎.github/workflows/docker-release.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Docker
2+
3+
on:
4+
push:
5+
# Publish `v1.2.3` tags as releases.
6+
tags:
7+
- v*
8+
9+
env:
10+
IMAGE_NAME: bsc
11+
12+
jobs:
13+
# Push image to GitHub Packages.
14+
push:
15+
runs-on: ubuntu-latest
16+
if: github.event_name == 'push'
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
21+
- name: Build image
22+
run: |
23+
docker build . \
24+
--label "org.opencontainers.image.source=${{ secrets.IMAGE_SOURCE }}" \
25+
--label "org.opencontainers.image.revision=$(git rev-parse HEAD)" \
26+
--label "org.opencontainers.image.version=$(git describe --tags --abbrev=0)" \
27+
--label "org.opencontainers.image.licenses=LGPL-3.0,GPL-3.0" \
28+
-f ./Dockerfile -t "${IMAGE_NAME}"
29+
30+
- name: Log into registry
31+
run: echo "${{ secrets.PACKAGE_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
32+
33+
- name: Push image
34+
run: |
35+
IMAGE_ID=ghcr.io/${{ github.repository }}
36+
37+
# Change all uppercase to lowercase
38+
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
39+
# Strip git ref prefix from version
40+
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
41+
# Strip "v" prefix from tag name
42+
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
43+
# Use Docker `latest` tag convention
44+
[ "$VERSION" == "master" ] && VERSION=latest
45+
echo IMAGE_ID=$IMAGE_ID
46+
echo VERSION=$VERSION
47+
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
48+
docker tag $IMAGE_NAME $IMAGE_ID:latest
49+
docker push $IMAGE_ID:$VERSION
50+
docker push $IMAGE_ID:latest
51+

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
unit-test:
1616
strategy:
1717
matrix:
18-
go-version: [1.16.x]
18+
go-version: [1.17.x]
1919
os: [ubuntu-18.04]
2020
runs-on: ${{ matrix.os }}
2121
steps:

‎.github/workflows/pre-release.yml‎

Lines changed: 1 addition & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Build Release
1111
strategy:
1212
matrix:
13-
go-version: [1.16.x]
13+
go-version: [1.17.x]
1414
os: [ubuntu-18.04, macos-11, windows-2019]
1515
runs-on: ${{ matrix.os }}
1616
steps:
@@ -45,19 +45,6 @@ jobs:
4545
- name: Build Binary for ${{matrix.os}}
4646
run: make geth
4747

48-
# ==============================
49-
# Cross Compile for ARM
50-
# ==============================
51-
52-
- name: Build Binary for ARM
53-
if: matrix.os == 'ubuntu-18.04'
54-
env:
55-
GOPATH: /home/runner/work/woodpecker/go
56-
run: |
57-
mkdir -p $GOPATH/src/github.com/binance-chain/bsc/
58-
cp -r ./* $GOPATH/src/github.com/binance-chain/bsc/
59-
cd $GOPATH/src/github.com/binance-chain/bsc/ && make geth-linux-arm
60-
6148
# ==============================
6249
# Upload artifacts
6350
# ==============================
@@ -83,34 +70,6 @@ jobs:
8370
name: windows
8471
path: ./build/bin/geth.exe
8572

86-
- name: Upload ARM-5 Build
87-
uses: actions/upload-artifact@v2
88-
if: matrix.os == 'ubuntu-18.04'
89-
with:
90-
name: arm5
91-
path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-5
92-
93-
- name: Upload ARM-6 Build
94-
uses: actions/upload-artifact@v2
95-
if: matrix.os == 'ubuntu-18.04'
96-
with:
97-
name: arm6
98-
path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-6
99-
100-
- name: Upload ARM-7 Build
101-
uses: actions/upload-artifact@v2
102-
if: matrix.os == 'ubuntu-18.04'
103-
with:
104-
name: arm7
105-
path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-7
106-
107-
- name: Upload ARM-64 Build
108-
uses: actions/upload-artifact@v2
109-
if: matrix.os == 'ubuntu-18.04'
110-
with:
111-
name: arm64
112-
path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm64
113-
11473
release:
11574
name: Release
11675
needs: build
@@ -143,30 +102,6 @@ jobs:
143102
with:
144103
name: windows
145104
path: ./windows
146-
147-
- name: Download Artifacts
148-
uses: actions/download-artifact@v2
149-
with:
150-
name: arm5
151-
path: ./arm5
152-
153-
- name: Download Artifacts
154-
uses: actions/download-artifact@v2
155-
with:
156-
name: arm6
157-
path: ./arm6
158-
159-
- name: Download Artifacts
160-
uses: actions/download-artifact@v2
161-
with:
162-
name: arm7
163-
path: ./arm7
164-
165-
- name: Download Artifacts
166-
uses: actions/download-artifact@v2
167-
with:
168-
name: arm64
169-
path: ./arm64
170105

171106
- name: Download Config File
172107
run: |
@@ -226,46 +161,6 @@ jobs:
226161
asset_path: ./windows/geth.exe
227162
asset_name: geth_windows.exe
228163
asset_content_type: application/octet-stream
229-
230-
- name: Upload Release Asset - Linux ARM 5
231-
uses: actions/upload-release-asset@v1
232-
env:
233-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
234-
with:
235-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
236-
asset_path: ./arm5/geth-linux-arm-5
237-
asset_name: geth-linux-arm-5
238-
asset_content_type: application/octet-stream
239-
240-
- name: Upload Release Asset - Linux ARM 6
241-
uses: actions/upload-release-asset@v1
242-
env:
243-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
244-
with:
245-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
246-
asset_path: ./arm6/geth-linux-arm-6
247-
asset_name: geth-linux-arm-6
248-
asset_content_type: application/octet-stream
249-
250-
- name: Upload Release Asset - Linux ARM 7
251-
uses: actions/upload-release-asset@v1
252-
env:
253-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
254-
with:
255-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
256-
asset_path: ./arm7/geth-linux-arm-7
257-
asset_name: geth-linux-arm-7
258-
asset_content_type: application/octet-stream
259-
260-
- name: Upload Release Asset - Linux ARM 64
261-
uses: actions/upload-release-asset@v1
262-
env:
263-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
264-
with:
265-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
266-
asset_path: ./arm64/geth-linux-arm64
267-
asset_name: geth-linux-arm64
268-
asset_content_type: application/octet-stream
269164

270165
- name: Upload Release Asset - MAINNET.ZIP
271166
uses: actions/upload-release-asset@v1

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Build Release
1212
strategy:
1313
matrix:
14-
go-version: [1.16.x]
14+
go-version: [1.17.x]
1515
os: [ubuntu-18.04, macos-11, windows-2019]
1616
runs-on: ${{ matrix.os }}
1717
steps:
@@ -46,19 +46,6 @@ jobs:
4646
- name: Build Binary for ${{matrix.os}}
4747
run: make geth
4848

49-
# ==============================
50-
# Cross Compile for ARM
51-
# ==============================
52-
53-
- name: Build Binary for ARM
54-
if: matrix.os == 'ubuntu-18.04'
55-
env:
56-
GOPATH: /home/runner/work/woodpecker/go
57-
run: |
58-
mkdir -p $GOPATH/src/github.com/binance-chain/bsc/
59-
cp -r ./* $GOPATH/src/github.com/binance-chain/bsc/
60-
cd $GOPATH/src/github.com/binance-chain/bsc/ && make geth-linux-arm
61-
6249
# ==============================
6350
# Upload artifacts
6451
# ==============================
@@ -84,34 +71,6 @@ jobs:
8471
name: windows
8572
path: ./build/bin/geth.exe
8673

87-
- name: Upload ARM-5 Build
88-
uses: actions/upload-artifact@v2
89-
if: matrix.os == 'ubuntu-18.04'
90-
with:
91-
name: arm5
92-
path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-5
93-
94-
- name: Upload ARM-6 Build
95-
uses: actions/upload-artifact@v2
96-
if: matrix.os == 'ubuntu-18.04'
97-
with:
98-
name: arm6
99-
path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-6
100-
101-
- name: Upload ARM-7 Build
102-
uses: actions/upload-artifact@v2
103-
if: matrix.os == 'ubuntu-18.04'
104-
with:
105-
name: arm7
106-
path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-7
107-
108-
- name: Upload ARM-64 Build
109-
uses: actions/upload-artifact@v2
110-
if: matrix.os == 'ubuntu-18.04'
111-
with:
112-
name: arm64
113-
path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm64
114-
11574
release:
11675
name: Release
11776
needs: build
@@ -145,30 +104,6 @@ jobs:
145104
name: windows
146105
path: ./windows
147106

148-
- name: Download Artifacts
149-
uses: actions/download-artifact@v2
150-
with:
151-
name: arm5
152-
path: ./arm5
153-
154-
- name: Download Artifacts
155-
uses: actions/download-artifact@v2
156-
with:
157-
name: arm6
158-
path: ./arm6
159-
160-
- name: Download Artifacts
161-
uses: actions/download-artifact@v2
162-
with:
163-
name: arm7
164-
path: ./arm7
165-
166-
- name: Download Artifacts
167-
uses: actions/download-artifact@v2
168-
with:
169-
name: arm64
170-
path: ./arm64
171-
172107
- name: Download Config File
173108
run: |
174109
. ./.github/release.env
@@ -236,46 +171,6 @@ jobs:
236171
asset_name: geth_windows.exe
237172
asset_content_type: application/octet-stream
238173

239-
- name: Upload Release Asset - Linux ARM 5
240-
uses: actions/upload-release-asset@v1
241-
env:
242-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
243-
with:
244-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
245-
asset_path: ./arm5/geth-linux-arm-5
246-
asset_name: geth-linux-arm-5
247-
asset_content_type: application/octet-stream
248-
249-
- name: Upload Release Asset - Linux ARM 6
250-
uses: actions/upload-release-asset@v1
251-
env:
252-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
253-
with:
254-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
255-
asset_path: ./arm6/geth-linux-arm-6
256-
asset_name: geth-linux-arm-6
257-
asset_content_type: application/octet-stream
258-
259-
- name: Upload Release Asset - Linux ARM 7
260-
uses: actions/upload-release-asset@v1
261-
env:
262-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
263-
with:
264-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
265-
asset_path: ./arm7/geth-linux-arm-7
266-
asset_name: geth-linux-arm-7
267-
asset_content_type: application/octet-stream
268-
269-
- name: Upload Release Asset - Linux ARM 64
270-
uses: actions/upload-release-asset@v1
271-
env:
272-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
273-
with:
274-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
275-
asset_path: ./arm64/geth-linux-arm64
276-
asset_name: geth-linux-arm64
277-
asset_content_type: application/octet-stream
278-
279174
- name: Upload Release Asset - MAINNET.ZIP
280175
uses: actions/upload-release-asset@v1
281176
env:

‎.github/workflows/unit-test.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
unit-test:
1616
strategy:
1717
matrix:
18-
go-version: [1.16.x]
18+
go-version: [1.17.x]
1919
os: [ubuntu-18.04]
2020
runs-on: ${{ matrix.os }}
2121
steps:
@@ -47,6 +47,5 @@ jobs:
4747
env:
4848
ANDROID_HOME: "" # Skip android test
4949
run: |
50-
go clean -testcache
5150
make test
5251

0 commit comments

Comments
 (0)