From 092534c9f2c938096b18531f1e1ecb187eb6c92b Mon Sep 17 00:00:00 2001
From: Friendly C <52448715+friendlycrab@users.noreply.github.com>
Date: Thu, 10 Oct 2019 17:13:14 +0200
Subject: [PATCH] Fix travis

---
 .travis.yml | 8 +++-----
 main.go     | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02b7a25a0..2181b806b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,15 +9,13 @@ env:
   - GO111MODULE=on
 before_install:
 - echo -e "machine github.com\n  login $CI_USER_TOKEN" > ~/.netrc
-- cd ui/v2
-- yarn install
-- CI=false yarn build # TODO: Fix warnings
-- cd ../..
+- yarn --cwd ui/v2 install
+- make generate
+- CI=false yarn --cwd ui/v2 build # TODO: Fix warnings
 #- go get -v github.com/mgechev/revive
 script:
 #- make lint
 #- make vet
-- make generate
 - go test
 before_deploy:
 - docker pull stashappdev/compiler
diff --git a/main.go b/main.go
index bff1b8e1a..a13460d5f 100644
--- a/main.go
+++ b/main.go
@@ -1,5 +1,5 @@
 //go:generate go run github.com/99designs/gqlgen
-//go:generate packr2
+//go:generate go run github.com/gobuffalo/packr/v2/packr2
 package main
 
 import (