From e79fe3165ebc6de8347b3a95d19bf5a5e271d768 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Thu, 7 Mar 2024 11:12:35 -0800 Subject: [PATCH] Fix broken build (#1442) --- .goreleaser.yaml | 2 +- Makefile | 2 ++ go.mod | 6 +++--- go.sum | 12 ++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 572de169a..ae94cbdec 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -13,7 +13,7 @@ builds: - amd64 - arm64 env: - - CGO_FLAGS="-O2 -D__BLST_PORTABLE__" + - CGO_CFLAGS=-O2 -D__BLST_PORTABLE__ - CGO_ENABLED=1 - CC_darwin_amd64=o64-clang - CXX_darwin_amd64=o64-clang+ diff --git a/Makefile b/Makefile index a5ac84408..2b51cd907 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,8 @@ endif ci: install-tools generate test coverage $(BINARY): + CGO_ENABLED=1 \ + CGO_CFLAGS="-O2 -D__BLST_PORTABLE__" \ GO111MODULE=on go build \ -trimpath \ -ldflags \ diff --git a/go.mod b/go.mod index 72cf43267..df2744356 100644 --- a/go.mod +++ b/go.mod @@ -14,9 +14,9 @@ require ( github.com/onflow/fcl-dev-wallet v0.7.4 github.com/onflow/flixkit-go v1.1.2 github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f - github.com/onflow/flow-emulator v0.61.0 + github.com/onflow/flow-emulator v0.61.1 github.com/onflow/flow-go-sdk v0.46.0 - github.com/onflow/flowkit v0.17.0 + github.com/onflow/flowkit v1.17.1 github.com/onflowser/flowser/v3 v3.1.3 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pkg/errors v0.9.1 @@ -179,7 +179,7 @@ require ( github.com/onflow/flow-cli/flowkit v1.11.0 // indirect github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f // indirect github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 // indirect - github.com/onflow/flow-go v0.33.2-0.20240306170028-bd1722d73820 // indirect + github.com/onflow/flow-go v0.33.2-0.20240306234901-64ab8d27ea30 // indirect github.com/onflow/flow-nft/lib/go/contracts v1.1.0 // indirect github.com/onflow/flow/protobuf/go/flow v0.3.7 // indirect github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead // indirect diff --git a/go.sum b/go.sum index 8077806f3..a01595446 100644 --- a/go.sum +++ b/go.sum @@ -905,12 +905,12 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f/go.mod h1:jM6GMAL+m0hjusUgiYDNrixPQ6b9s8xjoJQoEu5bHQI= github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f h1:Ep+Mpo2miWMe4pjPGIaEvEzshRep30dvNgxqk+//FrQ= github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f/go.mod h1:ZeLxwaBkzuSInESGjL8/IPZWezF+YOYsYbMrZlhN+q4= -github.com/onflow/flow-emulator v0.61.0 h1:nrgY5YQ+BcKIyZ7o7keQzKZdtpLnB//DIpnI+txvYcw= -github.com/onflow/flow-emulator v0.61.0/go.mod h1:WjJrpG6K5tRIaI79E7uaX5a/EEBpciOq4L3iOnjZZaE= +github.com/onflow/flow-emulator v0.61.1 h1:7uCzphiAMjZbehsCSTQ8mQWUpMeKqjxCd45yYRvMEQk= +github.com/onflow/flow-emulator v0.61.1/go.mod h1:YLR3/wi4Z9j7s9tJyIvTmxH3wAsO7zkFHSRrW0axyuE= github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0= github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU= -github.com/onflow/flow-go v0.33.2-0.20240306170028-bd1722d73820 h1:xDa3pMxz4t15sLLhCgURZSGmS4lixGtaVSdwcKwsdaM= -github.com/onflow/flow-go v0.33.2-0.20240306170028-bd1722d73820/go.mod h1:I5sWWA5pHsJDlZV61iqqQ3k++IhB/k1qE/80s2sjP5s= +github.com/onflow/flow-go v0.33.2-0.20240306234901-64ab8d27ea30 h1:1JkIA71XEspysh2EsAGeOi1gNc2/TgZJ9kGyyPWJWDU= +github.com/onflow/flow-go v0.33.2-0.20240306234901-64ab8d27ea30/go.mod h1:I5sWWA5pHsJDlZV61iqqQ3k++IhB/k1qE/80s2sjP5s= github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74= github.com/onflow/flow-go-sdk v0.46.0 h1:mrIQziCDe6Oi5HH/aPFvYluh1XUwO6lYpoXLWrBZc2s= github.com/onflow/flow-go-sdk v0.46.0/go.mod h1:azVWF0yHI8wT1erF0vuYGqQZybl6Frbc+0Zu3rIPeHc= @@ -920,8 +920,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9j github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8= github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk= github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= -github.com/onflow/flowkit v0.17.0 h1:qC7NOjCqaebSHaybPCMF3MvbKis6kK8zVptVNBsonQo= -github.com/onflow/flowkit v0.17.0/go.mod h1:kayB4X5Wm30hQOjhiiJ2TSXfRkMJB9TmdOnPlBBt264= +github.com/onflow/flowkit v1.17.1 h1:h8ok2cYsuKwu4BGAWOdMh6UancKyyYxsX6Kv0KCQIhQ= +github.com/onflow/flowkit v1.17.1/go.mod h1:zu2r0bM5eebHBD3e3Bmp0IbAPcOvGxL17Nm3X0YpM2Q= github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead h1:2j1Unqs76Z1b95Gu4C3Y28hzNUHBix7wL490e61SMSw= github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead/go.mod h1:E3ScfQb5XcWJCIAdtIeEnr5i5l2y60GT0BTXeIHseWg= github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8=