From 4d0ebc5e07346f5a0bfa78218231d4b259e56be2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:05:36 -0700 Subject: [PATCH] Add small fixes (#2493) (#2495) (cherry picked from commit d2a16492abf8b28c7c890ad4b175b1689138b978) Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com> --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c23071fb1e8..7678f8c4e46 100644 --- a/Makefile +++ b/Makefile @@ -99,11 +99,11 @@ $(BUILDDIR)/: build-reproducible: build-reproducible-amd64 build-reproducible-arm64 -build-reproducible-amd64: go.sum +build-reproducible-amd64: go.sum $(BUILDDIR)/ $(DOCKER) buildx create --name osmobuilder || true $(DOCKER) buildx use osmobuilder $(DOCKER) buildx build \ - --build-arg GO_VERSION=$(shell go list -f {{.GoVersion}} -m) \ + --build-arg GO_VERSION=$(shell cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2) \ --platform linux/arm64 \ -t osmosis-amd64 \ --load \ @@ -113,11 +113,11 @@ build-reproducible-amd64: go.sum $(DOCKER) cp osmobinary:/bin/osmosisd $(BUILDDIR)/osmosisd-linux-amd64 $(DOCKER) rm -f osmobinary -build-reproducible-arm64: go.sum +build-reproducible-arm64: go.sum $(BUILDDIR)/ $(DOCKER) buildx create --name osmobuilder || true $(DOCKER) buildx use osmobuilder $(DOCKER) buildx build \ - --build-arg GO_VERSION=$(shell go list -f {{.GoVersion}} -m) \ + --build-arg GO_VERSION=$(shell cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2) \ --platform linux/arm64 \ -t osmosis-arm64 \ --load \