Skip to content
This repository has been archived by the owner on Oct 18, 2023. It is now read-only.

goreleaser cross version fix #16

Merged
merged 21 commits into from
Mar 22, 2023
6 changes: 3 additions & 3 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project_name: erigon

release:
disable: false
draft: true
draft: false
prerelease: auto

builds:
Expand Down Expand Up @@ -70,7 +70,7 @@ dockers:
- 0xpolygon/{{ .ProjectName }}:{{ .Version }}-amd64
dockerfile: Dockerfile.release
use: buildx
skip_push: true
skip_push: false
goarch: amd64
ids:
- linux-amd64
Expand All @@ -80,7 +80,7 @@ dockers:
- image_templates:
- 0xpolygon/{{ .ProjectName }}:{{ .Version }}-arm64
dockerfile: Dockerfile.release
skip_push: true
skip_push: false
use: buildx
goarch: arm64
ids:
Expand Down
13 changes: 5 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ git-submodules:
@git submodule update --quiet --init --recursive --force || true

PACKAGE_NAME := github.com/maticnetwork/erigon
GOLANG_CROSS_VERSION ?= v1.19.5
GOLANG_CROSS_VERSION ?= v1.18.1

.PHONY: release-dry-run
release-dry-run: git-submodules
Expand All @@ -228,8 +228,8 @@ release-dry-run: git-submodules
-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 --skip-publish
goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
--rm-dist --skip-validate --skip-publish

.PHONY: release
release: git-submodules
Expand All @@ -243,11 +243,8 @@ release: git-submodules
-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
goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
--rm-dist --skip-validate

# 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