Skip to content

Commit

Permalink
Merge pull request #42 from confio/release-0.6
Browse files Browse the repository at this point in the history
Release 0.6
  • Loading branch information
ethanfrey authored Jan 16, 2020
2 parents 05d9b04 + e3289d4 commit 5c1370f
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
4 changes: 1 addition & 3 deletions Dockerfile → Dockerfile.cross
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,11 @@ RUN chmod -R 777 /usr/local/cargo
WORKDIR /code
RUN rm -rf /scratch

COPY build/build_linux.sh /opt
COPY build/build_osx.sh /opt
COPY build/build.sh /opt
RUN chmod +x /opt/build*

RUN mkdir /.cargo
RUN chmod +rx /.cargo
COPY build/cargo-config /.cargo/config

CMD ["/opt/build.sh"]
CMD ["/opt/build_osx.sh"]
15 changes: 8 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: all build build-rust build-go test docker-image docker-build docker-image-centos7

DOCKER_TAG := demo
DOCKER_TAG := 0.6
USER_ID := $(shell id -u)
USER_GROUP = $(shell id -g)

Expand Down Expand Up @@ -49,11 +49,12 @@ build-go:
test:
RUST_BACKTRACES=1 go test -v ./api ./types

docker-image:
docker build . -t confio/go-cosmwasm:$(DOCKER_TAG)

docker-image-centos7:
docker build . -t confio/go-cosmwasm:$(DOCKER_TAG) -f ./Dockerfile.centos7
docker build . -t go-cosmwasm:$(DOCKER_TAG)-centos7 -f ./Dockerfile.centos7

docker-image-cross:
docker build . -t go-cosmwasm:$(DOCKER_TAG)-cross -f ./Dockerfile.cross

docker-build:
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code confio/go-cosmwasm:$(DOCKER_TAG)
release: docker-image-cross docker-image-centos7
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code go-cosmwasm:$(DOCKER_TAG)-cross
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code go-cosmwasm:$(DOCKER_TAG)-centos
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ This provides go bindings to the [cosmwasm](https://github.com/confio/cosmwasm)
contract framework. In particular, it allows you to easily compile, initialize,
and execute these contracts from Go.

As of the 0.6.0 release, we support [cosmwasm](https://github.com/confio/cosmwasm) 0.6.3
and any compatible smart contracts.

## Structure

This repo contains both Rust and Go code. The rust code is compiled into a dll/so
Expand All @@ -12,6 +15,16 @@ involves compiling rust -> C library, and linking that library to the Go code.
For ergonomics of the user, we will include pre-compiled libraries to easily
link with, and Go developers should just be able to import this directly.

## Supported Platforms

Since this package includes a rust prebuilt dll, you cannot just import the go code,
but need to be on a system that works with an existing dll. Currently this is Linux
(tested on Ubuntu, Debian, and CentOS7) and MacOS. We have a build system for Windows,
but it is not supported by the wasmer singlepass backend which we rely upon for gas
metering.

*Note: Windows is not supported currently*

## Design

Please read the [Documentation](./spec/Index.md) to understand both the general
Expand Down
Binary file modified api/libgo_cosmwasm.dylib
Binary file not shown.
Binary file modified api/libgo_cosmwasm.so
Binary file not shown.

0 comments on commit 5c1370f

Please sign in to comment.