diff --git a/.circleci/config.yml b/.circleci/config.yml index 3003f55f72..998624a09e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,8 @@ version: 2.1 +orbs: + win: circleci/windows@5.0 + executors: golang: docker: @@ -96,6 +99,41 @@ jobs: - store_artifacts: path: /tmp/logs + test-windows: + executor: + name: win/default + shell: bash.exe + steps: + - checkout + - run: + name: Install make and mingw + # See https://github.com/docker/containerd-packaging/pull/294 for discussion around mingw version + command: | + set -o errexit + choco install -y make + choco install -y mingw --version 10.2.0 --allow-downgrade + - run: + name: Show Go version information + command: | + go version + make --version + - run: + name: Build + command: | + set -o errexit + LEDGER_ENABLED=false make build + - run: + name: Copy wasmvm.dll to build folder (next to wasmd.exe) + command: | + set -o errexit + /usr/bin/find $HOME/go/pkg/mod/github.com/ -name wasmvm.dll -exec cp "{}" build/ \; + - run: + name: Check libwasmvm-version + command: | + set -o errexit + ./build/wasmd.exe version + ./build/wasmd.exe query wasm libwasmvm-version + benchmark: executor: golang parallelism: 1 @@ -241,3 +279,4 @@ workflows: - simulations: requires: - setup-dependencies + - test-windows diff --git a/Makefile b/Makefile index d85996fbe9..4bb41dfea2 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ all: install lint test build: go.sum ifeq ($(OS),Windows_NT) - exit 1 + go build -mod=readonly $(BUILD_FLAGS) -o build/wasmd.exe ./cmd/wasmd else go build -mod=readonly $(BUILD_FLAGS) -o build/wasmd ./cmd/wasmd endif diff --git a/go.mod b/go.mod index 9140e8e461..f8af729a9b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/CosmWasm/wasmd go 1.19 require ( - github.com/CosmWasm/wasmvm v1.1.1 + github.com/CosmWasm/wasmvm v1.1.2-0.20221127235710-6dd44ce800a6 github.com/cosmos/cosmos-proto v1.0.0-alpha8 github.com/cosmos/cosmos-sdk v0.45.11 github.com/cosmos/gogoproto v1.4.3 diff --git a/go.sum b/go.sum index c7b2fad923..1f0ba5960f 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmvm v1.1.1 h1:0xtdrmmsP9fibe+x42WcMkp5aQ738BICgcH3FNVLzm4= -github.com/CosmWasm/wasmvm v1.1.1/go.mod h1:ei0xpvomwSdONsxDuONzV7bL1jSET1M8brEx0FCXc+A= +github.com/CosmWasm/wasmvm v1.1.2-0.20221127235710-6dd44ce800a6 h1:l/TeEThJGvSboam0t/vAg7EZcfjIFsbpZyYqydUh99Y= +github.com/CosmWasm/wasmvm v1.1.2-0.20221127235710-6dd44ce800a6/go.mod h1:OIhXFPi9BbcEL1USBj4OIrBTtSSds+9eEql56fsdyfE= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=