Merge pull request #729 from holochain/develop

Alpha 1 release

.travis.yml

@@ -1,24 +1,24 @@
 sudo: required
 language: go
 go:
-- 1.8.x
 - 1.9.x
+- 1.10.x
 env:
   global:
   - secure: R2/THCRt0p/5XR7vcYg77fNk2vLuBGcNIfu7/a47BxVREYUkAqHK2MpG6x9TbbUPnJksEpXeXHH3OVVyK7Q+QsNX6dcOfl15DBafJHlMbfMTJWGDm+pBhNLFSKtA3DRnyOTR/ZpN+xnN7A0TSl/WB+PNxX4TjZtFTAaVtZpVbK6Ins6pHylVh00biLVyZ/W2AowCqiM95Yt4SfnybHn8KApJ/orjbtlJL1+2qQa+rF5N625/pDDf4MF/CLbdODlKPJ1M704/Kq3mo4KgutL0xFPxI3hDPO6LwWdW/izmcfEP56J3UpuXbcnDwSgS6ieAH7gDjBZGC/BYp7IoZrvjLCUuL6QSefWm1G/NJZuL2J1PInHF8kKnvm6/bFkAcRNByVSsdrgqwjQUkHZ/1FP+OMEDFWZk1bRXt8nHsIa0VbmyM+7cn5sCgCIIEsBJbbyQA40eGk0BkCWBbqCrb1shSEYvYBM44CBZHuMIvpp0BfX9Fl5gM1XW0FfzUXw5lBmi6/JWy7DDAL0axkmFe3abq7vmWHUQybEW295UuUDvDO8ioTGYMWf5LLKs02nxIZIuccEdozlO1vohkucYpKamjZu/YcR0den7eHMxzU/dmTK8qZjKhQ6aOH/1xLpeCSE2fG5sHVT+0uQe/4p2Bq4QbF/ljk6kujUc4jlK6NIwg/g=
   - secure: KU/2msclYm1J9KQidXgRl63uEYev7op/kr5w37KNJaCTqmYUHk/090+4SQmEFf0csHNCeyqmHD4tTHQ4oKsIsmfmuC4EQkEmBvwBbQVT9+lmWM1cuHRZRnSudDa4UT36OVLc+iyR2wkTYcaDan6ZaYmd9tDW8pfyOP7TxH3rf/9TqACnKKjMeHyINxgijTqiSGNnBQaNyTiBa/y/60Eg78eqq3zVPZKkae6dqAJtHqrFJTLbE4rlfHcrkmYsZhUIcyXAzw/+elz4gKC4llPXQ9mpxruBJxI+LVOoFmaqTdXpYa/Bsc9PteJOQQdecPWS0XkbV6T7Y44gAtlevsbyedSv0tmVniM4jXTnsMJ0f3gZzV5kXLM2A5rpw3gIkdqtg+a3GkVIy229Ljz1KH17o6nf1AAndqrh7wCOMXTHt1xxC+26vExnAIcyDQHpzx/Y4vmGUAhJJujIfh9Ld4YYdI2r9dP3i8N8qxFZyuQ9Lh3S1AMdIf5sBRTr6rPnZtU0UC5HYWxlGhfv7eWuMydUX2zLOmgHQXkY9/Jp+4YJ3H/Ge1qf8UtfhZBxMJM6sYdplNVpNE6NE1CemprPc7A2AotUdGlUFdGGuxLSat8tPlLe0wlf31EhdskSOf35fUJuVSJDxb4x4Flan0O42qKAgjRT+OVYB4R9/8MWQi/k8+Y=
 services:
 - docker
-before_install:
-- if [ "$TRAVIS_BRANCH" == "master" ]; then cd docker; docker build -t "metacurrency/holochain" .; cd ..; fi
 script:
 - make hcdev
-- TEST_FLAGS='-v -coverprofile=$(pkg_path)/coverage.txt -covermode=atomic' make -e
-  test
+- TEST_FLAGS='-v -coverprofile=$(pkg_path)/coverage.txt -covermode=atomic' make -e test
+- docker build -t smoke-test docker && docker run smoke-test
 cache:
   directories:
   - $GOPATH/src/gx
 after_success:
 - bash <(curl -s https://codecov.io/bash)
-- if [ "$TRAVIS_BRANCH" == "master" ]; then docker login -u "$DOCKER_USERNAME" -p
-  "$DOCKER_PASSWORD"; docker push metacurrency/holochain; fi
+- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then cd docker; docker build --build-arg BRANCH=master -t "holochain/holochain-proto" .; cd ..; fi
+- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"; docker push holochain/holochain-proto; fi
+- if [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then cd docker; docker build -t "holochain/holochain-proto:develop" .; cd ..; fi
+- if [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"; docker push holochain/holochain-proto:develop; fi

LICENSE

@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
+    Holochain - Holographic storage for distributed applications
+    Copyright (C) 2018  Arthur Brock, Eric Harris-Braun, et. al.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    {project}  Copyright (C) {year}  {fullname}
+    Holochain Copyright (C) 2018  Arthur Brock, Eric Harris-Braun, et. al.
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

Make.bat

@@ -1,4 +1,4 @@
-go get github.com\metacurrency\holochain\cmd\hcdev
-go get github.com\metacurrency\holochain\cmd\hcd
-go get github.com\metacurrency\holochain\cmd\hcadmin
-go get github.com\metacurrency\holochain\cmd\bs
+go get github.com\holochain\holochain-proto\cmd\hcdev
+go get github.com\holochain\holochain-proto\cmd\hcd
+go get github.com\holochain\holochain-proto\cmd\hcadmin
+go get github.com\holochain\holochain-proto\cmd\bs

Makefile

@@ -5,13 +5,13 @@ endif
 GOBIN = $(value GOPATH)/bin
 
 ifeq ($(OS),Windows_NT)
-$(warning using hardcoded repo of github.com/metacurrency/holochain)
-REPO = github.com/metacurrency/holochain
+$(warning using hardcoded repo of github.com/holochain/holochain-proto)
+REPO = github.com/holochain/holochain-proto
 else
 REPO = $(CURDIR:$(GOPATH)/src/%=%)
 endif
 # Remove a $(GOPATH)/src/ from the beginning of the current directory.
-# Likely to be github.com/metacurrency/holochain
+# Likely to be github.com/holochain/holochain-proto
 
 go_packages = . ./ui ./apptest $(sort $(dir $(wildcard ./cmd/*/)))
 # List of directories containing go packages
@@ -36,7 +36,7 @@ define new_line
 
 endef
 
-.PHONY: hcd hcdev hcadmin hccore bs test deps work pub
+.PHONY: hcd hcdev hcadmin bs test deps work pub
 # Anything which requires deps should end with: gx-go rewrite --undo
 
 all: deps
@@ -48,9 +48,6 @@ hcd: deps
 hcdev: deps
 	go get $(REPO)/cmd/hcdev
 	gx-go rewrite --undo
-hccore: deps
-	go get $(REPO)/cmd/hccore
-	gx-go rewrite --undo
 hcadmin: deps
 	go get $(REPO)/cmd/hcadmin
 	gx-go rewrite --undo