diff --git a/.travis.yml b/.travis.yml index b2d47d0..6088a62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,11 @@ language: go go: -- 1.12.x + - 1.12.x + +node_js: + - 12.4.0 + +# make frontend all won't work. The frontend assets have to be already built at the time of +# evaluating the Makefile first time, so for now I do it in two turns. +script: make frontend && make all diff --git a/Makefile b/Makefile index bc085c4..00fa2c6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -DEPS=github.com/elisescu/pty github.com/sirupsen/logrus golang.org/x/crypto/ssh/terminal github.com/gorilla/mux github.com/gorilla/websocket +DEPS=github.com/elisescu/pty github.com/sirupsen/logrus golang.org/x/crypto/ssh/terminal github.com/gorilla/mux github.com/gorilla/websocket github.com/go-bindata/go-bindata/... DEST_DIR=./out TTY_SERVER=$(DEST_DIR)/tty-server TTY_SHARE=$(DEST_DIR)/tty-share @@ -36,7 +36,7 @@ tty-server/assets_bundle.go: $(TTY_SERVER_ASSETS) zip $@ $^ frontend: force - cd frontend && npm run build && cd - + cd frontend && npm install && npm run build && cd - force: # Other different targets