Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] support travis CI #1

Merged
merged 7 commits into from
Jun 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .travis.yaml → .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
language: go

services:
- mongodb

go:
- "1.10.x"

cache:
directories:
- vendor/github.com
- vendor/golang.org
- vendor/gopkg.in
- vendor/k8s.io

install:
- go get -u github.com/kardianos/govendor
- make pre-build

script:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Vortex
Vortex [![Build Status](https://travis-ci.org/linkernetworks/vortex.svg?branch=master)](https://travis-ci.org/linkernetworks/vortex) [![Go Report Card](https://goreportcard.com/badge/github.com/linkernetworks/vortex)](https://goreportcard.com/report/github.com/linkernetworks/vortex)
===

# Package sharing between Aurora

Define what package can and can't be shared between aurora, vortex, and 5g-vortex. Since the ownership of vortex source code will be transfered to ITRI or open source.
Define what package can and can't be shared between aurora, vortex, and 5g-vortex. Since the ownership of vortex source code will be transfered to ITRI or open source.

Stay private:
1. Core aurora service packages like jobserver, jobupdater, ...
Expand All @@ -22,7 +22,7 @@ Vortex share the same config and dependent services with aurora. Make sure depen
- Redis
- Gearmand

### GoBuild
### GoBuild

Build
```
Expand Down
2 changes: 1 addition & 1 deletion config/testing.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}
},
"mongo": {
"url": "mongodb://localhost:31717/vortex_test"
"url": "mongodb://localhost:27017/vortex_test"
},
"influxdb": {
"url": "http://localhost:8086",
Expand Down
3 changes: 2 additions & 1 deletion src/cmd/vortex/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package main

import (
"bitbucket.org/linkernetworks/vortex/src/server"
"flag"

"github.com/linkernetworks/vortex/src/server"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions src/net/http/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package http
import (
"net/http"

"bitbucket.org/linkernetworks/vortex/src/serviceprovider"
"bitbucket.org/linkernetworks/vortex/src/web"
"github.com/emicklei/go-restful"
"github.com/linkernetworks/logger"
"github.com/linkernetworks/vortex/src/serviceprovider"
"github.com/linkernetworks/vortex/src/web"
)

type NativeContextHandler func(*web.NativeContext)
Expand Down
2 changes: 1 addition & 1 deletion src/net/http/responsetest/assert.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http/httptest"
"testing"

response "bitbucket.org/linkernetworks/aurora/src/net/http"
response "github.com/linkernetworks/vortex/src/net/http"

"encoding/json"
"encoding/xml"
Expand Down
2 changes: 1 addition & 1 deletion src/net/http/responsetest/assert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http/httptest"
"testing"

response "bitbucket.org/linkernetworks/aurora/src/net/http"
response "github.com/linkernetworks/vortex/src/net/http"

"github.com/stretchr/testify/assert"
)
Expand Down
7 changes: 4 additions & 3 deletions src/server/app.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package server

import (
"bitbucket.org/linkernetworks/vortex/src/serviceprovider"
"github.com/linkernetworks/config"
"github.com/linkernetworks/logger"
"log"
"net"
"net/http"

"github.com/linkernetworks/config"
"github.com/linkernetworks/logger"
"github.com/linkernetworks/vortex/src/serviceprovider"
)

type App struct {
Expand Down
8 changes: 4 additions & 4 deletions src/server/handler_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"reflect"
"strconv"

"bitbucket.org/linkernetworks/vortex/src/entity"
response "bitbucket.org/linkernetworks/vortex/src/net/http"
"bitbucket.org/linkernetworks/vortex/src/net/http/query"
"bitbucket.org/linkernetworks/vortex/src/web"
"github.com/linkernetworks/logger"
"github.com/linkernetworks/utils/timeutils"
"github.com/linkernetworks/vortex/src/entity"
response "github.com/linkernetworks/vortex/src/net/http"
"github.com/linkernetworks/vortex/src/net/http/query"
"github.com/linkernetworks/vortex/src/web"
mgo "gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
)
Expand Down
4 changes: 2 additions & 2 deletions src/server/handler_network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strings"
"testing"

"bitbucket.org/linkernetworks/vortex/src/entity"
"bitbucket.org/linkernetworks/vortex/src/serviceprovider"
restful "github.com/emicklei/go-restful"
"github.com/influxdata/influxdb/pkg/testing/assert"
"github.com/linkernetworks/config"
"github.com/linkernetworks/vortex/src/entity"
"github.com/linkernetworks/vortex/src/serviceprovider"
mgo "gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
)
Expand Down
2 changes: 1 addition & 1 deletion src/server/handler_version.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package server

import (
"bitbucket.org/linkernetworks/vortex/src/serviceprovider"
"github.com/emicklei/go-restful"
"github.com/linkernetworks/vortex/src/serviceprovider"
)

func VersionHandler(sp *serviceprovider.Container) restful.RouteFunction {
Expand Down
4 changes: 2 additions & 2 deletions src/server/route.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package server

import (
handler "bitbucket.org/linkernetworks/vortex/src/net/http"
"bitbucket.org/linkernetworks/vortex/src/serviceprovider"
"github.com/emicklei/go-restful"
"github.com/gorilla/mux"
handler "github.com/linkernetworks/vortex/src/net/http"
"github.com/linkernetworks/vortex/src/serviceprovider"
)

func (a *App) AppRoute() *mux.Router {
Expand Down
2 changes: 1 addition & 1 deletion src/web/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package web
import (
"net/http"

"bitbucket.org/linkernetworks/vortex/src/serviceprovider"
restful "github.com/emicklei/go-restful"
"github.com/linkernetworks/vortex/src/serviceprovider"
)

type Context struct {
Expand Down
24 changes: 21 additions & 3 deletions vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@
{
"checksumSHA1": "HgOVOUtWUYHcNe8aipwuEZ7YLow=",
"path": "github.com/gomodule/redigo/redis",
"revision": "9352ab68be133885e31a43661cc42a220cb8e821",
"revisionTime": "2018-04-01T19:18:55Z"
"revision": "bb5990dc771ab24e169aaea90ee3b9ad50cffce9",
"revisionTime": "2018-06-01T13:19:09Z"
},
{
"checksumSHA1": "PKVjAJ/e0p/jWtGpZycgoZBLdb4=",
Expand Down Expand Up @@ -176,6 +176,12 @@
"revision": "48a0ecefe2e4190c7a2d63b477875854a2f993b3",
"revisionTime": "2018-05-20T01:50:35Z"
},
{
"checksumSHA1": "g/V4qrXjUGG9B+e3hB+4NAYJ5Gs=",
"path": "github.com/gorilla/context",
"revision": "08b5f424b9271eedf6f9f0ce86cb9396ed337a42",
"revisionTime": "2016-08-17T18:46:32Z"
},
{
"checksumSHA1": "Aw8z8w/d+EFt8XCUYPjzSe0bPrU=",
"path": "github.com/gorilla/mux",
Expand Down Expand Up @@ -254,6 +260,18 @@
"revision": "ba3bf9c1d0421aa146564a632931730344f1f9f1",
"revisionTime": "2018-02-20T04:22:22Z"
},
{
"path": "github.com/linkernetworks/aurora-debug",
"revision": ""
},
{
"path": "github.com/linkernetworks/aurora-debug/github.com/emicklei/go-restful",
"revision": ""
},
{
"path": "github.com/linkernetworks/aurora/src/net/http",
"revision": ""
},
{
"checksumSHA1": "ZhjkfAPQ1hqwwB+9j6GJ87tEnic=",
"path": "github.com/linkernetworks/config",
Expand Down Expand Up @@ -1449,5 +1467,5 @@
"revisionTime": "2018-06-14T22:41:26Z"
}
],
"rootPath": "bitbucket.org/linkernetworks/vortex"
"rootPath": "github.com/linkernetworks/vortex"
}