Merge pull request #26 from CosmWasm/multiple-contracts-support

Multiple contracts support

Author: maurolacy

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.10.6
+
+- Add support for building multiple non-workspace contracts at once (#25)
+
 ## 0.10.5
 
 - Remove `trzeci/emscripten` dependency and install `wasm-opt` manually

Makefile

@@ -2,7 +2,7 @@
 
 DOCKER_NAME_RUST_OPTIMIZER := "cosmwasm/rust-optimizer"
 DOCKER_NAME_WORKSPACE_OPTIMIZER := "cosmwasm/workspace-optimizer"
-DOCKER_TAG := 0.10.5
+DOCKER_TAG := 0.10.6
 
 build-rust-optimizer:
 	docker build -t $(DOCKER_NAME_RUST_OPTIMIZER):$(DOCKER_TAG) --file rust-optimizer.Dockerfile .

README.md

@@ -24,7 +24,7 @@ you to produce a smaller build that works with the cosmwasm integration tests
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/rust-optimizer:0.10.5
+  cosmwasm/rust-optimizer:0.10.6
 ```
 
 Demo this with `cosmwasm-examples` (going into eg. `erc20` subdir before running),
@@ -57,7 +57,7 @@ To compile all contracts in the workspace deterministically, you can run:
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/workspace-optimizer:0.10.5
+  cosmwasm/workspace-optimizer:0.10.6
 ```
 
 The downside is that to verify one contract in the workspace, you need to compile them
@@ -83,7 +83,7 @@ case, we can use the optimize.sh command:
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="devcontract_cache_burner",target=/code/contracts/burner/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/rust-optimizer:0.10.5 ./contracts/burner
+  cosmwasm/rust-optimizer:0.10.6 ./contracts/burner
 ```
 
 ## Development

optimize.sh

@@ -5,17 +5,19 @@ command -v shellcheck > /dev/null && shellcheck "$0"
 export PATH=$PATH:/root/.cargo/bin
 
 mkdir -p artifacts
-contractdir="$1"
+contractdirs="$@"
 
 # There are two cases here
 # 1. All contracts (or one) are included in the root workspace  (eg. `cosmwasm-template`, `cosmwasm-examples`, `cosmwasm-plus`)
 #    In this case, we pass no argument, just mount the proper directory.
-# 2. Contacts are excluded from the root workspace, but import relative paths from other packages (only `cosmwasm`).
+# 2. Contracts are excluded from the root workspace, but import relative paths from other packages (only `cosmwasm`).
 #    In this case, we mount root workspace and pass in a path `docker run <repo> ./contracts/hackatom`
 
 # This parameter allows us to mount a folder into docker container's "/code"
 # and build "/code/contracts/mycontract".
 # Note: if contractdir is "." (default in Docker), this ends up as a noop
+for contractdir in $contractdirs
+do
 echo "Building contract in $(realpath -m "$contractdir")"
 (
   cd "$contractdir"
@@ -39,3 +41,4 @@ done
 )
 
 echo "done"
+done