Skip to content

Commit

Permalink
fix: arm32 (v6/v7) builds (#20)
Browse files Browse the repository at this point in the history
* fix: arm32 (v6/v7) builds

* chore: remove unused target

* build: change back to main
  • Loading branch information
dataviruset authored Mar 8, 2024
1 parent a39152b commit ca87514
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ jobs:
build:
name: Build
uses: aukilabs/go-tooling/.github/workflows/build.yml@main

5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ FROM --platform=$BUILDPLATFORM golang:1.21 as build
RUN mkdir -p /app/bin
WORKDIR /app
ADD . /app
ARG TARGETOS
ARG TARGETARCH
ARG TARGETOS TARGETARCH TARGETVARIANT
ARG VERSION
RUN make GOOS="${TARGETOS}" GOARCH="${TARGETARCH}" VERSION="${VERSION}" bin/hagall
RUN make GOOS="${TARGETOS}" GOARCH="${TARGETARCH}" arm_version="${TARGETVARIANT}" VERSION="${VERSION}" bin/hagall

##
## Run-time
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ help: go-build
test: go-normalize
@go test -p 1 ./...

clean: services-stop go-tidy
clean: go-tidy
@-rm -rf bin
@-rm -rf vendor

Expand All @@ -62,7 +62,7 @@ else
endif

bin/hagall: go-vendor
CGO_ENABLED=0 go build -mod vendor -ldflags "-X main.version=${VERSION}" -o ./bin/hagall ./cmd
CGO_ENABLED=0 GOARM="$$(echo "$$arm_version" | cut -c 2-)" go build -mod vendor -ldflags "-X main.version=${VERSION}" -o ./bin/hagall ./cmd

integration-tests:
@pip3 install -q web3
Expand Down

0 comments on commit ca87514

Please sign in to comment.