From 2b1972387ec124e5e7fc3a00016395404c6e59a0 Mon Sep 17 00:00:00 2001 From: HenryNguyen5 <6404866+HenryNguyen5@users.noreply.github.com> Date: Fri, 13 Sep 2024 17:31:14 -0700 Subject: [PATCH 1/2] Query exact wasmvm module rather than parsing all (#14425) --- tools/bin/goreleaser_utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bin/goreleaser_utils b/tools/bin/goreleaser_utils index fa9553274c5..979204d1e3a 100755 --- a/tools/bin/goreleaser_utils +++ b/tools/bin/goreleaser_utils @@ -25,7 +25,7 @@ _get_arch() { _get_wasmvm_lib_path() { local -r platform="$1" local -r arch="$2" - wasmvm_dir=$(go list -json -m all | jq -r '. | select(.Path == "github.com/CosmWasm/wasmvm") | .Dir') + wasmvm_dir=$(go list -json -m github.com/CosmWasm/wasmvm | jq -r '.Dir') shared_lib_dir="$wasmvm_dir/internal/api" lib_name="libwasmvm" if [ "$platform" == "darwin" ]; then From 6aa6196353b4a65a412d0073d5bad89133bc32b1 Mon Sep 17 00:00:00 2001 From: Sergey Kudasov Date: Mon, 16 Sep 2024 22:10:51 +0200 Subject: [PATCH 2/2] exclude sourcegraph missing dependency (#14446) * exclude sourcegrapht * use replace --- core/scripts/go.mod | 2 ++ dashboard-lib/go.mod | 2 ++ go.mod | 2 ++ integration-tests/go.mod | 2 ++ integration-tests/load/go.mod | 2 ++ 5 files changed, 10 insertions(+) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index f106525d2a3..2ba849969fa 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -373,3 +373,5 @@ replace ( github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f ) + +replace github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264 diff --git a/dashboard-lib/go.mod b/dashboard-lib/go.mod index 10270853ed1..8e68d3c6203 100644 --- a/dashboard-lib/go.mod +++ b/dashboard-lib/go.mod @@ -23,3 +23,5 @@ require ( github.com/stretchr/testify v1.9.0 // indirect golang.org/x/sys v0.16.0 // indirect ) + +replace github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264 diff --git a/go.mod b/go.mod index 3fec96a0150..f5b85242764 100644 --- a/go.mod +++ b/go.mod @@ -361,3 +361,5 @@ replace ( // until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69 github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f ) + +replace github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264 diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 783be44031d..dd6a0948004 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -531,3 +531,5 @@ replace ( github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.14.0 github.com/prometheus/common => github.com/prometheus/common v0.42.0 ) + +replace github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264 diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index c887e800ab2..1404d20f14d 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -564,3 +564,5 @@ replace ( k8s.io/sample-controller => k8s.io/sample-controller v0.28.2 sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.2 ) + +replace github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264