From 6b61789c36f69af60426b12b15591b06f6a22339 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 12 May 2020 10:05:50 +0200 Subject: [PATCH 1/3] Fix dependencies to work in clean go1.6/1.7 environments. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e326480..999a52a 100644 --- a/Makefile +++ b/Makefile @@ -37,11 +37,11 @@ hook: godeps: GOPATH=$(GOPATH) $(GO) get github.com/rogpeppe/godeps -easyjson: +easyjson: dependencies GOPATH=$(GOPATH) $(GO) get -d github.com/mailru/easyjson/... GOPATH=$(GOPATH) $(GO) build -o ./vendor/bin/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go -dependencies: hook godeps easyjson src/signaling/continentmap.go +dependencies: hook godeps src/signaling/continentmap.go GOPATH=$(GOPATH) ./vendor/bin/godeps -u dependencies.tsv dependencies.tsv: godeps @@ -82,7 +82,7 @@ coverhtml: dependencies vet common %_easyjson.go: %.go PATH=$(shell dirname $(GO)):$(PATH) GOPATH=$(GOPATH) ./vendor/bin/easyjson -all $*.go -common: \ +common: easyjson \ src/signaling/api_signaling_easyjson.go \ src/signaling/api_backend_easyjson.go \ src/signaling/natsclient_easyjson.go \ From 9eb4fb1a47dccedfc1f6094e4e35a5aca9957b30 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 12 May 2020 09:58:05 +0200 Subject: [PATCH 2/3] CI: Add Travis integration. --- .travis.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4d01c85 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,27 @@ +language: go + +go: + - 1.6 + - 1.7 + - 1.8 + - 1.9 + - 1.10 + - 1.11 + - 1.12 + - 1.13 + - 1.14 + - master + +cache: + directories: + - vendor/ + +install: + - make godeps + - make dependencies + +script: + - make client + - make server + - travis_retry make test + - travis_retry make cover From 70ee3d9726fb354f42bb31758d7b56fea89e0eb3 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 12 May 2020 10:09:29 +0200 Subject: [PATCH 3/3] Add Travis build status. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 318df06..a38fa6c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Spreed standalone signaling server +[![Build Status](https://travis-ci.org/strukturag/nextcloud-spreed-signaling.svg?branch=master)](https://travis-ci.org/strukturag/nextcloud-spreed-signaling) + This repository contains the standalone signaling server which can be used for Nextcloud Talk (https://apps.nextcloud.com/apps/spreed).