Skip to content

Commit

Permalink
Merge pull request #336 from unarxiv/xzyaoi/feat/social-login
Browse files Browse the repository at this point in the history
Xzyaoi/feat/social login
  • Loading branch information
Xiaozhe Yao committed Apr 6, 2019
2 parents 8a9af5a + 9a68cda commit 7df52d4
Show file tree
Hide file tree
Showing 24 changed files with 1,061 additions and 646 deletions.
28 changes: 28 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
language: go
sudo: required
git:
clone: quiet

env:
# needed for the snap pipe:
- GO111MODULE=on

script:
- make test-cli

go:
- 1.12.x
- master

matrix:
allow_failures:
- go: tip

install: true

deploy:
- provider: script
skip_cleanup: true
script: curl -sL https://git.io/goreleaser | bash
on:
tags: true
46 changes: 0 additions & 46 deletions CODE_OF_CONDUCT.md

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2018 Xiaozhe Yao and contributors
Copyright (c) 2016-2018 Xiaozhe Yao & AICAMP.CO.,LTD & Other Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion LICENSE-996-Forbidden
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) <2019> Xiaozhe Yao & AICAMP.CO.,LTD
Copyright (c) <2019> Xiaozhe Yao & AICAMP.CO.,LTD & Other Contributors

996 License Version 1.0 (Draft)

Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ default:
@echo "\tmake package"
@echo "\tmake clean"
@echo "\tmake publish"
test:

build-arm:
cd cli && env GOOS=linux GOARCH=arm go build cli/
test-cli:
cd cli && go test -race -v ./... && go build

format-py:
autoflake -i cvpm/*.py
Expand Down
3 changes: 2 additions & 1 deletion cli/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
vendor/
cli
cli
dist/
30 changes: 26 additions & 4 deletions cli/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
#/bin/bash
env GOOS=windows GOARCH=amd64 go build . -o dist/cvpm-windows
env GOOS=linux GOARCH=amd64 go build . -o dist/cvpm-linux
env GOOS=darwin GOARCH=amd64 go build
#!/usr/bin/env bash
package=$1
if [[ -z "$package" ]]; then
echo "usage: $0 <package-name>"
exit 1
fi
package_name="cvpm"
platforms=("windows/amd64" "darwin/amd64" "linux/amd64" "linux/arm64" "linux/mips" "freebsd/amd64")
VERSION=`git describe --tags`
BUILD=`date +%FT%T%z`
for platform in "${platforms[@]}"
do
platform_split=(${platform//\// })
GOOS=${platform_split[0]}
GOARCH=${platform_split[1]}
echo 'Building CVPM for '$GOOS'/'$GOARCH'...'
output_name=$package_name'-'$GOOS'-'$GOARCH
if [ $GOOS = "windows" ]; then
output_name+='.exe'
fi
env GOOS=$GOOS GOARCH=$GOARCH go build -ldflags "-s -w -X main.Version=${VERSION} -X main.Build=${BUILD}" -o 'dist/'$output_name $package
if [ $? -ne 0 ]; then
echo 'An error has occurred! Aborting the script execution...'
exit 1
fi
done
62 changes: 62 additions & 0 deletions cli/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
module cvpm

go 1.12

require (
github.com/BurntSushi/toml v0.3.1
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
github.com/alecthomas/gometalinter v3.0.0+incompatible // indirect
github.com/alexrudd/cognito-srp v0.0.0-20190402174326-7bb6280c912c
github.com/appleboy/gofight v2.0.0+incompatible // indirect
github.com/aws/aws-sdk-go-v2 v0.7.0
github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23 // indirect
github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261 // indirect
github.com/cvpm-contrib/auth v0.0.0-20190320071300-b5f20060ba38
github.com/cvpm-contrib/database v0.0.0-20190403053658-8054ddd981c3
github.com/cvpm-contrib/dataset v0.0.0-20190201103727-840ea55c2bb8
github.com/emirpasic/gods v1.12.0 // indirect
github.com/fatih/color v1.7.0
github.com/flosch/pongo2 v0.0.0-20141028000813-5e81b817a0c4
github.com/getsentry/raven-go v0.2.0
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
github.com/gin-contrib/static v0.0.0-20190301062546-ed515893e96b
github.com/gin-gonic/gin v1.3.0
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/golang/protobuf v1.3.1 // indirect
github.com/googollee/go-socket.io v0.0.0-20190317095603-ed07a7212e28
github.com/hpcloud/tail v1.0.0
github.com/jondot/goweight v1.0.4 // indirect
github.com/json-iterator/go v1.1.6 // indirect
github.com/kardianos/service v0.0.0-20190326161025-0e5bec1b9eec
github.com/labstack/echo v3.3.10+incompatible // indirect
github.com/labstack/gommon v0.2.8 // indirect
github.com/levigross/grequests v0.0.0-20180715163950-d0df86deffcb
github.com/lunixbochs/vtclean v1.0.0 // indirect
github.com/manifoldco/promptui v0.3.2
github.com/mattn/go-isatty v0.0.7 // indirect
github.com/mattn/go-runewidth v0.0.4 // indirect
github.com/mattn/go-sqlite3 v1.10.0 // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/nicksnyder/go-i18n v1.10.0 // indirect
github.com/olekukonko/tablewriter v0.0.1
github.com/pelletier/go-toml v1.3.0 // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/shirou/gopsutil v2.18.12+incompatible
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
github.com/syndtr/goleveldb v0.0.0-20190318030020-c3a204f8e965
github.com/urfave/cli v1.20.0
github.com/valyala/fasttemplate v1.0.1 // indirect
github.com/xanzy/ssh-agent v0.2.1 // indirect
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c
golang.org/x/net v0.0.0-20190328230028-74de082e2cca // indirect
golang.org/x/sys v0.0.0-20190402142545-baf5eb976a8c // indirect
golang.org/x/tools v0.0.0-20190402200628-202502a5a924 // indirect
gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20180810215634-df19058c872c // indirect
gopkg.in/appleboy/gin-status-api.v1 v1.0.1
gopkg.in/appleboy/gofight.v1 v1.0.4 // indirect
gopkg.in/fukata/golang-stats-api-handler.v1 v1.0.0 // indirect
gopkg.in/gin-gonic/gin.v1 v1.3.0 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.0 // indirect
gopkg.in/src-d/go-git.v4 v4.10.0
upper.io/db.v3 v3.5.7+incompatible // indirect
)
Loading

0 comments on commit 7df52d4

Please sign in to comment.