Move dev (flipt-io#103)

* Move dev folder out of build * update dockerignore * Fix snapshot and release script
rio · Jul 8, 2019 · 5ed6d9a · 5ed6d9a
1 parent 1d0014d
commit 5ed6d9a
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 10 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -10,9 +10,9 @@
 .github/
 .vagrant/
 app/
-bazel-*/
 bin/
 build/
+dev/
 dist/
 Dockerfile
 docs/

diff --git a/Makefile b/Makefile
@@ -80,12 +80,12 @@ dev: ## Build and run in development mode
 .PHONY: snapshot
 snapshot: ## Build a snapshot version
 	@echo ">> building a snapshot version"
-	@./build/release/snapshot
+	@./build/snapshot
 
 .PHONY: release
 release: ## Build and publish a release
 	@echo ">> building and publishing a release"
-	@./build/release/release
+	@./build/release
 
 .PHONY: help
 help:

diff --git a/build/release/Dockerfile → build/Dockerfile b/build/release/Dockerfile → build/Dockerfile
diff --git a/build/release/release → build/release b/build/release/release → build/release
@@ -4,7 +4,7 @@ set -euo pipefail
 
 GORELEASER_VERSION=v0.106
 
-cd "$(dirname "$0")/../.." || exit
+cd "$(dirname "$0")/.." || exit
 
 read -r -p "Are you sure? [y/N] " response
 if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]
@@ -17,6 +17,4 @@ then
     -e DOCKER_USERNAME \
     -e DOCKER_PASSWORD \
     goreleaser/goreleaser:"$GORELEASER_VERSION"-cgo --rm-dist
-
-  mkdocs gh-deploy
 fi
diff --git a/build/release/snapshot → build/snapshot b/build/release/snapshot → build/snapshot
@@ -4,7 +4,7 @@ set -euo pipefail
 
 GORELEASER_VERSION=v0.106
 
-cd "$(dirname "$0")/../.." || exit
+cd "$(dirname "$0")/.." || exit
 
 docker run --rm --privileged \
   -v "$PWD":/flipt \

diff --git a/build/dev/README.md → dev/README.md b/build/dev/README.md → dev/README.md
diff --git a/build/dev/centos/Vagrantfile → dev/centos/Vagrantfile b/build/dev/centos/Vagrantfile → dev/centos/Vagrantfile
@@ -16,5 +16,5 @@ Vagrant.configure("2") do |config|
   # guest extensions, install this plugin to do so:
   #
   # vagrant plugin install vagrant-vbguest
-  config.vm.synced_folder "../../..", "/flipt"
+  config.vm.synced_folder "../..", "/flipt"
 end
diff --git a/build/dev/centos/setup.sh → dev/centos/setup.sh b/build/dev/centos/setup.sh → dev/centos/setup.sh
diff --git a/build/dev/ubuntu/Vagrantfile → dev/ubuntu/Vagrantfile b/build/dev/ubuntu/Vagrantfile → dev/ubuntu/Vagrantfile
@@ -16,5 +16,5 @@ Vagrant.configure("2") do |config|
   # guest extensions, install this plugin to do so:
   #
   # vagrant plugin install vagrant-vbguest
-  config.vm.synced_folder "../../..", "/flipt"
+  config.vm.synced_folder "../..", "/flipt"
 end
diff --git a/build/dev/ubuntu/setup.sh → dev/ubuntu/setup.sh b/build/dev/ubuntu/setup.sh → dev/ubuntu/setup.sh
diff --git a/docs/development.md b/docs/development.md
@@ -27,7 +27,7 @@ Flipt uses Go 1.12 with [Go Modules](https://github.com/golang/go/wiki/Modules)
 
 You can also easily get started with a development environment running in a VM using [Vagrant](https://www.vagrantup.com/) and [Virtual Box](https://www.virtualbox.org/wiki/Downloads).
 
-Once you have Vagrant and Virtual Box installed you can `cd` into either the `build/dev/ubuntu` or `build/dev/centos` directories and run `vagrant up`.
+Once you have Vagrant and Virtual Box installed you can `cd` into either the `dev/ubuntu` or `dev/centos` directories and run `vagrant up`.
 
 This will provision a VM that installs the necessary dev dependencies and runs the Flipt test suite.