From a0c1c52ac5b97c6d2b2d0de75e6a60172a4f213a Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 16 Jun 2020 01:11:31 +0200
Subject: [PATCH] Last update/cleanup

---
 .circleci/config.yml | 7 ++++++-
 Dockerfile.alpine    | 7 ++++---
 go.mod               | 3 ++-
 go.sum               | 2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e69bdce6..20be2479 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -197,7 +197,7 @@ jobs:
       - setup_remote_docker
       - run:
           name: Build Docker artifact - demo
-          command: docker build --pull -t "cosmwasm/wasmd:${CIRCLE_SHA1}" . -f Dockerfile.alpine
+          command: docker build --pull -t "cosmwasm/wasmd-demo:${CIRCLE_SHA1}" .
       - run:
           name: Push application Docker image to docker hub
           command: |
@@ -274,9 +274,14 @@ workflows:
   version: 2
   test-suite:
     jobs:
+      # this is now a slow process... let's only run on master
       - docker-image:
           requires:
             - setup-dependencies
+          filters:
+            branches:
+              only:
+                - master
       - docker-tagged:
           filters:
             tags:
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index a2669653..019697a8 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -6,15 +6,16 @@ RUN apk add git
 # without this, build with LEDGER_ENABLED=false
 RUN apk add libusb-dev linux-headers
 
-ENV GO_COSMWASM="v0.8.2-0.20200615215318-6f82d95b1cb6"
-
 # copy all code into /code
 WORKDIR /code
 COPY . /code
 
 # download all deps
 RUN go mod download
-RUN ls -ld /go/pkg/mod/github.com/\!cosm\!wasm/go-cosmwasm@v*
+# TODO: how to use this instead of hardcoding GO_COSMWASM
+RUN basename $(ls -d /go/pkg/mod/github.com/\!cosm\!wasm/go-cosmwasm@v*)
+
+ENV GO_COSMWASM="v0.8.2-0.20200615221537-0fc920db0349"
 
 # build go-cosmwasm *.a and install it
 WORKDIR /go/pkg/mod/github.com/\!cosm\!wasm/go-cosmwasm@${GO_COSMWASM}
diff --git a/go.mod b/go.mod
index 1aca65c0..941885c3 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,8 @@ module github.com/CosmWasm/wasmd
 go 1.13
 
 require (
-	github.com/CosmWasm/go-cosmwasm v0.8.2-0.20200615215318-6f82d95b1cb6
+    // Note: update ENV GO_COSMWASM in Dockerfile.alpine when updating this
+	github.com/CosmWasm/go-cosmwasm v0.8.2-0.20200615221537-0fc920db0349
 	github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect
 	github.com/cosmos/cosmos-sdk v0.38.3
 	github.com/golang/mock v1.4.3 // indirect
diff --git a/go.sum b/go.sum
index 804101ff..675bb931 100644
--- a/go.sum
+++ b/go.sum
@@ -11,6 +11,8 @@ github.com/ChainSafe/go-schnorrkel v0.0.0-20200102211924-4bcbc698314f h1:4O1om+U
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200102211924-4bcbc698314f/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
 github.com/CosmWasm/go-cosmwasm v0.8.2-0.20200615215318-6f82d95b1cb6 h1:o/CwMvx7YP+Mnu4MvEypThjpmimGcd0ahJYUqKLI4q8=
 github.com/CosmWasm/go-cosmwasm v0.8.2-0.20200615215318-6f82d95b1cb6/go.mod h1:gAFCwllx97ejI+m9SqJQrmd2SBW7HA0fOjvWWJjM2uc=
+github.com/CosmWasm/go-cosmwasm v0.8.2-0.20200615221537-0fc920db0349 h1:SsPn/AHKtsZqKlGfXXArT/OUur9wJY79YNjFCIv1JZw=
+github.com/CosmWasm/go-cosmwasm v0.8.2-0.20200615221537-0fc920db0349/go.mod h1:gAFCwllx97ejI+m9SqJQrmd2SBW7HA0fOjvWWJjM2uc=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=