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

fix release CI #318

Merged
merged 3 commits into from
Mar 11, 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
1 change: 1 addition & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- devel
- devel_1.2.0
workflow_dispatch:

jobs:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
branches:
- devel
- alpha
- devel_1.2.0
- 'release/**'
pull_request:
branches:
- devel_1.2.0
- devel
- alpha
- 'release/**'
Expand Down Expand Up @@ -55,9 +57,9 @@ jobs:
- name: Install golangci-lint
if: runner.os == 'Linux'
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v4
with:
version: v1.55.2
version: v1.56.1
skip-build-cache: true
args: --help

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- devel
- devel_1.2.0

jobs:
coverage:
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,11 @@ jobs:
with:
fetch-depth: 0

- name: dockerhub-login
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB }}
password: ${{ secrets.DOCKERHUB_KEY }}
- name: ghcr-login
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Prepare
Expand All @@ -57,9 +52,6 @@ jobs:
- name: Run GoReleaser
run: |
make release
docker images
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${{ steps.prepare.outputs.tag_name }}
DOCKER_USERNAME: ${{ secrets.DOCKERHUB }}
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }}
VERSION: ${{ steps.prepare.outputs.tag_name }}
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ install:
@echo "Copied files to $(DIST):"
@ls -al "$(DIST)"

PACKAGE_NAME := github.com/ledgerwatch/erigon
PACKAGE_NAME := github.com/node-real/erigon
GOLANG_CROSS_VERSION ?= v1.21.6

.PHONY: release-dry-run
Expand All @@ -271,16 +271,12 @@ release: git-submodules
--privileged \
-e CGO_ENABLED=1 \
-e GITHUB_TOKEN \
-e DOCKER_USERNAME \
-e DOCKER_PASSWORD \
-v /var/run/docker.sock:/var/run/docker.sock \
-v `pwd`:/go/src/$(PACKAGE_NAME) \
-w /go/src/$(PACKAGE_NAME) \
ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
--clean --skip-validate

@docker image push --all-tags thorax/erigon
@docker image push --all-tags ghcr.io/ledgerwatch/erigon

# since DOCKER_UID, DOCKER_GID are default initialized to the current user uid/gid,
# we need separate envvars to facilitate creation of the erigon user on the host OS.
Expand Down
4 changes: 2 additions & 2 deletions core/vm/lightclient/v2/lightclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ func DecodeConsensusState(input []byte) (ConsensusState, error) {
pos += validatorVotingPowerLength

relayerAddress := make([]byte, relayerAddressLength)
copy(relayerAddress[:], validatorBytes[pos:pos+relayerAddressLength])
copy(relayerAddress, validatorBytes[pos:pos+relayerAddressLength])
pos += relayerAddressLength

relayerBlsKey := make([]byte, relayerBlsKeyLength)
copy(relayerBlsKey[:], validatorBytes[pos:])
copy(relayerBlsKey, validatorBytes[pos:])

validator := types.NewValidator(pubkey, votingPower)
validator.SetRelayerAddress(relayerAddress)
Expand Down
Loading