Skip to content

Commit

Permalink
Merge pull request #293 from icon-project/fix/ci-build
Browse files Browse the repository at this point in the history
upgrade: wasmvm to version 2.1.0
  • Loading branch information
debendraoli authored Jul 17, 2024
2 parents 0002b52 + 90f3e80 commit cc518fe
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 287 deletions.
13 changes: 7 additions & 6 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ builds:
main: ./main.go
hooks:
pre:
- wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvmstatic_darwin.a -O /lib/libwasmvmstatic_darwin.a
- wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvmstatic_darwin.a -P /lib
goos:
- darwin
goarch:
Expand All @@ -26,7 +26,7 @@ builds:
main: ./main.go
hooks:
pre:
- wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvmstatic_darwin.a -O /lib/libwasmvmstatic_darwin.a
- wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvmstatic_darwin.a -P /lib
goos:
- darwin
goarch:
Expand All @@ -46,7 +46,7 @@ builds:
main: ./main.go
hooks:
pre:
- wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvm_muslc.x86_64.a -O /usr/lib/x86_64-linux-gnu/libwasmvm_muslc.a
- wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvm_muslc.x86_64.a -P /usr/lib/x86_64-linux-gnu
goos:
- linux
goarch:
Expand All @@ -60,15 +60,15 @@ builds:
ldflags:
- -s -w -X github.com/icon-project/centralized-relay/cmd.Version={{ .Tag }}
- -linkmode=external
- -extldflags '-static'
- -extldflags '-Wl,-z,muldefs -lm'
tags:
- muslc
- netgo
- id: linux-arm64
main: ./main.go
hooks:
pre:
- wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvm_muslc.aarch64.a -O /usr/lib/aarch64-linux-gnu/libwasmvm_muslc.a
- wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.LIBWASM_VERSION }}/libwasmvm_muslc.aarch64.a -P /usr/lib/aarch64-linux-gnu
goos:
- linux
goarch:
Expand All @@ -82,6 +82,7 @@ builds:
- -s -w -X github.com/icon-project/centralized-relay/cmd.Version={{ .Tag }}
- -linkmode=external
- -extldflags "-static"
- -extldflags '-Wl,-z,muldefs -lm'
tags:
- muslc
- netgo
Expand All @@ -95,7 +96,7 @@ archives:
- linux-arm64
name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
format: tar.gz
wrap_in_directory: true
wrap_in_directory: false

checksum:
name_template: SHA256SUMS-{{.Version}}.txt
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ test-all:

PACKAGE_NAME := github.com/icon-project/centralized-relay
GOLANG_CROSS_VERSION ?= v1.22.4
LIBWASM_VERSION ?= v2.0.1
LIBWASM_VERSION ?= v2.1.0

SYSROOT_DIR ?= sysroots
SYSROOT_ARCHIVE ?= sysroots.tar.bz2
Expand All @@ -60,7 +60,7 @@ release-dry-run:
-v `pwd`:/go/src/$(PACKAGE_NAME) \
-w /go/src/$(PACKAGE_NAME) \
goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
--clean --skip-validate --skip-publish
--clean --auto-snapshot

.PHONY: release
release:
Expand Down
29 changes: 15 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/icon-project/centralized-relay
go 1.22

require (
github.com/CosmWasm/wasmd v0.51.0
github.com/cometbft/cometbft v0.38.9
github.com/cosmos/cosmos-sdk v0.50.7
github.com/CosmWasm/wasmd v0.52.0
github.com/cometbft/cometbft v0.38.10
github.com/cosmos/cosmos-sdk v0.50.8
github.com/cosmos/relayer/v2 v2.5.2
github.com/ethereum/go-ethereum v1.14.7
github.com/gofrs/flock v0.8.1
Expand All @@ -29,8 +29,8 @@ require (
cloud.google.com/go/auth v0.4.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
cosmossdk.io/x/upgrade v0.1.1 // indirect
github.com/CosmWasm/wasmvm/v2 v2.0.0 // indirect
cosmossdk.io/x/upgrade v0.1.3 // indirect
github.com/CosmWasm/wasmvm/v2 v2.1.0 // indirect
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.9 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.0 // indirect
Expand All @@ -46,7 +46,8 @@ require (
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
github.com/cespare/cp v1.1.1 // indirect
github.com/cosmos/ibc-go/v8 v8.0.0 // indirect
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
github.com/cosmos/ibc-go/v8 v8.3.2 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect
Expand All @@ -73,13 +74,14 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/philhofer/fwd v1.1.2 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.52.2 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/prometheus/statsd_exporter v0.26.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shamaton/msgpack/v2 v2.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/tinylib/msgp v1.1.9 // indirect
Expand Down Expand Up @@ -118,8 +120,8 @@ require (
cosmossdk.io/log v1.3.1 // indirect
cosmossdk.io/math v1.3.0 // indirect
cosmossdk.io/store v1.1.0 // indirect
cosmossdk.io/x/evidence v0.1.0 // indirect
cosmossdk.io/x/feegrant v0.1.0 // indirect
cosmossdk.io/x/evidence v0.1.1 // indirect
cosmossdk.io/x/feegrant v0.1.1 // indirect
cosmossdk.io/x/tx v0.13.3 // indirect
filippo.io/edwards25519 v1.0.0 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
Expand Down Expand Up @@ -155,8 +157,8 @@ require (
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/gogoproto v1.4.12 // indirect
github.com/cosmos/iavl v1.1.2 // indirect
github.com/cosmos/gogoproto v1.5.0 // indirect
github.com/cosmos/iavl v1.2.0 // indirect
github.com/cosmos/ibc-go/modules/capability v1.0.0 // indirect
github.com/cosmos/ics23/go v0.10.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
Expand Down Expand Up @@ -199,7 +201,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter v1.7.4 // indirect
github.com/hashicorp/go-getter v1.7.5 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-metrics v0.5.3 // indirect
Expand All @@ -221,7 +223,6 @@ require (
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lib/pq v1.10.7 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/linxGnu/grocksdb v1.8.14 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/manifoldco/promptui v0.9.0 // indirect
Expand All @@ -243,7 +244,7 @@ require (
github.com/rivo/uniseg v0.4.3 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/rs/zerolog v1.32.0 // indirect
github.com/rs/zerolog v1.33.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/spf13/afero v1.11.0 // indirect
Expand Down
Loading

0 comments on commit cc518fe

Please sign in to comment.