From 3c249d5bb97a2e51c2116591035c22ec0ec1b718 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Wed, 20 Mar 2019 15:03:03 +0100
Subject: [PATCH] fix: bundling of static assets

---
 .travis.yml | 4 ++--
 Makefile    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9a238ca..642d075 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-  - "1.10"
+  - stable
 cache: yarn
 services:
   - docker
@@ -12,7 +12,7 @@ install:
 script:
   - make
   - goveralls -service=travis-ci -ignore="internal/handlers/static.go,internal/handlers/tmpls/tmpls.go"
-  - make buildDockerImage 
+  - make buildDockerImage
   - 'if [[ "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" = "master" ]]; then docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker push mxschmitt/golang_url_shortener && docker push mxschmitt/golang_url_shortener:arm; fi'
 deploy:
   provider: bintray
diff --git a/Makefile b/Makefile
index 9ed0986..99f8b94 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ buildNodeFrontend:
 	cd web && rm build/static/**/*.map
 
 embedFrontend:
-	packr2
+	cd cmd/golang-url-shortener && packr2
 
 getCMDDependencies:
 	go get -v github.com/mattn/goveralls