Skip to content

Commit

Permalink
Merge pull request #1 from cosmwasm/rename-to-wasmd
Browse files Browse the repository at this point in the history
Rename to Wasmd
  • Loading branch information
ethanfrey authored Nov 20, 2019
2 parents d6dfa14 + 01c371c commit 801630d
Show file tree
Hide file tree
Showing 112 changed files with 1,320 additions and 1,455 deletions.
179 changes: 29 additions & 150 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ executors:
golang:
docker:
- image: circleci/golang:1.13
working_directory: /go/src/github.com/cosmos/gaia
working_directory: /go/src/github.com/cosmwasm/wasmd
mac:
macos:
xcode: "10.3.0"
working_directory: /Users/distiller/project/src/github.com/cosmos/gaia
working_directory: /Users/distiller/project/src/github.com/cosmwasm/wasmd
environment:
GO_VERSION: "1.13"
docs:
Expand Down Expand Up @@ -93,41 +93,6 @@ jobs:
paths:
- "."

test-sim-nondeterminism:
executor: golang
steps:
- make:
target: test-sim-nondeterminism
description: "Test Gaia non-determinism simulations"

test-sim-import-export:
executor: golang
steps:
- make:
target: test-sim-import-export
description: "Test Gaia import/export simulation"

test-sim-after-import:
executor: golang
steps:
- make:
target: test-sim-after-import
description: "Test Gaia simulation after importing state"

test-sim-multi-seed-short:
executor: golang
steps:
- make:
target: test-sim-multi-seed-short
description: "Test Gaia multi-seed simulation (short-lived)"

test-sim-multi-seed-long:
executor: golang
steps:
- make:
target: test-sim-multi-seed-long
description: "Test Gaia multi-seed simulation (long-lived)"

integration-tests:
executor: golang
steps:
Expand Down Expand Up @@ -197,7 +162,7 @@ jobs:
command: bash <(curl -s https://codecov.io/bash) -f coverage.txt

localnet:
working_directory: /home/circleci/.go_workspace/src/github.com/cosmos/gaia
working_directory: /home/circleci/.go_workspace/src/github.com/cosmwasm/wasmd
machine:
image: circleci/classic:latest
environment:
Expand All @@ -221,58 +186,7 @@ jobs:
make clean localnet-start
./contrib/localnet-blocks-test.sh 40 5 10 localhost
deploy-docs:
executor: docs
steps:
- checkout
- run:
name: Trigger website build
command: |
curl --silent \
--show-error \
-X POST \
--header "Content-Type: application/json" \
-d "{\"branch\": \"$CIRCLE_BRANCH\"}" \
"https://circleci.com/api/v1.1/project/github/$CIRCLE_PROJECT_USERNAME/$WEBSITE_REPO_NAME/build?circle-token=$TENDERBOT_API_TOKEN" > response.json
RESULT=`jq -r '.status' response.json`
MESSAGE=`jq -r '.message' response.json`
if [[ ${RESULT} == "null" ]] || [[ ${RESULT} -ne "200" ]]; then
echo "CircleCI API call failed: $MESSAGE"
exit 1
else
echo "Website build started"
fi
macos-ci:
executor: mac
steps:
- mac_set_env
- run:
name: Install go
command: |
source $BASH_ENV
curl -L -O https://dl.google.com/go/go$GO_VERSION.darwin-amd64.tar.gz
tar -C $HOME -xzf go$GO_VERSION.darwin-amd64.tar.gz
rm go$GO_VERSION.darwin-amd64.tar.gz
go version
- checkout
- run:
name: Install SDK
command: |
source $BASH_ENV
make tools
make install
- run:
name: Integration tests
command: source $BASH_ENV
make test-build
- run:
name: Test full gaia simulation
command: |
source $BASH_ENV
make test-sim-gaia-fast
docker-image:
executor: golang
Expand All @@ -292,9 +206,9 @@ jobs:
if [ -z "${GAIAD_VERSION}" ]; then
docker build .
else
docker build -t tendermint/gaia:$GAIAD_VERSION .
docker build -t cosmwasm/wasmd:$GAIAD_VERSION .
docker login --password-stdin -u $DOCKER_USER \<<<$DOCKER_PASS
docker push tendermint/gaia:$GAIAD_VERSION
docker push cosmwasm/wasmd:$GAIAD_VERSION
fi
docker-tagged:
Expand Down Expand Up @@ -329,14 +243,14 @@ jobs:
rm -rf gitian-build-${os}/
done
- store_artifacts:
path: /go/src/github.com/cosmos/gaia/gaia-darwin-res.yml
path: /go/src/github.com/cosmwasm/wasmd/gaia-darwin-res.yml
- store_artifacts:
path: /go/src/github.com/cosmos/gaia/gaia-linux-res.yml
path: /go/src/github.com/cosmwasm/wasmd/gaia-linux-res.yml
- store_artifacts:
path: /go/src/github.com/cosmos/gaia/gaia-windows-res.yml
path: /go/src/github.com/cosmwasm/wasmd/gaia-windows-res.yml

# FIXME: The `setup-contract-tests-data` make target is broken as it completely
# overrides the .gaiad directory.
# overrides the .wasmd directory.
#
# contract_tests:
# executor: golang
Expand All @@ -360,31 +274,19 @@ workflows:
version: 2
test-suite:
jobs:
- docker-image:
requires:
- setup-dependencies
- docker-tagged:
filters:
tags:
only:
- /^v.*/
branches:
ignore:
- /.*/
requires:
- setup-dependencies
- macos-ci:
filters:
branches:
only:
- master
- develop
- deploy-docs:
filters:
branches:
only:
- master
- develop
# - docker-image:
# requires:
# - setup-dependencies
# - docker-tagged:
# filters:
# tags:
# only:
# - /^v.*/
# branches:
# ignore:
# - /.*/
# requires:
# - setup-dependencies
- setup-dependencies:
# filters here are needed to enable this job also for tags
filters:
Expand All @@ -394,42 +296,19 @@ workflows:
- integration-tests:
requires:
- setup-dependencies
- test-sim-nondeterminism:
requires:
- setup-dependencies
- test-sim-import-export:
requires:
- setup-dependencies
- test-sim-after-import:
requires:
- setup-dependencies
- test-sim-multi-seed-short:
requires:
- setup-dependencies
- test-sim-multi-seed-long:
requires:
- setup-dependencies
# These filters ensure that the long sim only runs during release
filters:
branches:
ignore: /.*/
tags:
only:
- /^v.*/
- test-cover:
requires:
- setup-dependencies
- localnet
- upload-coverage:
requires:
- test-cover
- reproducible-builds:
filters:
branches:
only:
- master
requires:
- setup-dependencies
# - reproducible-builds:
# filters:
# branches:
# only:
# - master
# requires:
# - setup-dependencies
# - contract_tests:
# requires:
# - setup-dependencies
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# CODEOWNERS: https://help.github.com/articles/about-codeowners/

# Primary repo maintainers
* @alessio @alexanderbez @rigelrozanski @jackzampolin @fedekunze
* @ethanfrey
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ v Please also ensure that this is not a duplicate issue :)

## Version

<!-- git commit hash, output of `gaiacli --version`, output of `gaiad --version` -->
<!-- git commit hash, output of `wasmcli --version`, output of `wasmd --version` -->

## Steps to Reproduce

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ v Before smashing the submit button please review the checkboxes.
v If a checkbox is n/a - please still include it but + a little note why
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->

- Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/gaia/blob/master/CONTRIBUTING.md#pr-targeting))
- Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmwasm/wasmd/blob/master/CONTRIBUTING.md#pr-targeting))

- [ ] Linked to github-issue with discussion and accepted design OR link to spec that describes this work.
- [ ] Wrote tests
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tools-stamp
# Data - ideally these don't exist
baseapp/data/*
client/lcd/keys/*
cmd/gaiacli/statik/statik.go
cmd/wasmcli/statik/statik.go
mytestnet

# Testing
Expand Down
Loading

0 comments on commit 801630d

Please sign in to comment.