Skip to content

Commit

Permalink
Fix compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
assafmo committed Nov 17, 2021
1 parent 88ccc92 commit 075bee0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ build_cli:

xgo_build_secretcli: go.sum
@echo "--> WARNING! This builds from origin/$(CURRENT_BRANCH)!"
xgo --image techknowlogick/xgo:go-1.15.x --targets $(XGO_TARGET) -tags="$(GO_TAGS) secretcli" -ldflags '$(LD_FLAGS)' --branch "$(CURRENT_BRANCH)" github.com/enigmampc/SecretNetwork/cmd/secretd
xgo --image techknowlogick/xgo:go-1.15.15 --targets $(XGO_TARGET) -tags="$(GO_TAGS) secretcli" -ldflags '$(LD_FLAGS)' --branch "$(CURRENT_BRANCH)" github.com/enigmampc/SecretNetwork/cmd/secretd

build_local_no_rust: bin-data-$(IAS_BUILD)
cp go-cosmwasm/target/$(BUILD_PROFILE)/libgo_cosmwasm.so go-cosmwasm/api
Expand All @@ -131,15 +131,19 @@ _build-linux: vendor

build_windows_cli:
$(MAKE) xgo_build_secretcli XGO_TARGET=windows/amd64
mv secretd-windows-4.0-amd64.exe secretcli-windows-4.0-amd64.exe

build_macos_cli:
$(MAKE) xgo_build_secretcli XGO_TARGET=darwin/amd64
mv secretd-darwin-10.6-amd64 secretcli-macos-amd64

build_linux_cli:
$(MAKE) xgo_build_secretcli XGO_TARGET=linux/amd64
mv secretd-linux-amd64 secretcli-linux-amd64

build_linux_arm64_cli:
$(MAKE) xgo_build_secretcli XGO_TARGET=linux/arm64
mv secretd-linux-arm64 secretcli-linux-arm64

build_all: build-linux build_windows_cli build_macos_cli build_linux_arm64_cli

Expand Down
2 changes: 1 addition & 1 deletion deployment/docker/MakefileCopy
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ build_cli:

xgo_build_secretcli: go.sum
@echo "--> WARNING! This builds from origin/$(CURRENT_BRANCH)!"
xgo --image techknowlogick/xgo:go-1.15.x --targets $(XGO_TARGET) -tags="$(GO_TAGS) secretcli" -ldflags '$(LD_FLAGS)' --branch "$(CURRENT_BRANCH)" github.com/enigmampc/SecretNetwork/cmd/secretd
xgo --image techknowlogick/xgo:go-1.15.15 --targets $(XGO_TARGET) -tags="$(GO_TAGS) secretcli" -ldflags '$(LD_FLAGS)' --branch "$(CURRENT_BRANCH)" github.com/enigmampc/SecretNetwork/cmd/secretd

build_local_no_rust: bin-data-$(IAS_BUILD)
cp go-cosmwasm/target/release/libgo_cosmwasm.so go-cosmwasm/api
Expand Down
4 changes: 2 additions & 2 deletions deployment/dockerfiles/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ ENV GOROOT=/usr/local/go
ENV GOPATH=/go/
ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin

RUN curl -O https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz
RUN tar -C /usr/local -xzf go1.13.8.linux-amd64.tar.gz
RUN curl -O https://dl.google.com/go/go1.15.15.linux-amd64.tar.gz
RUN tar -C /usr/local -xzf go1.15.15.linux-amd64.tar.gz
RUN go get -u github.com/jteeuwen/go-bindata/...

RUN wget -q https://github.com/WebAssembly/wabt/releases/download/1.0.20/wabt-1.0.20-ubuntu.tar.gz && \
Expand Down

0 comments on commit 075bee0

Please sign in to comment.