Commit 7c84f20b authored by zauberstuhl's avatar zauberstuhl

Move to gitlab

parent 3841bf8a
......@@ -19,8 +19,8 @@ stages:
- deploy
before_script:
- export VERSION=$(git describe --abbrev=0 --tags)
- mkdir -p $GOPATH/src/github.com/ganggo
- ln -s $(pwd) $GOPATH/src/github.com/ganggo/ganggo
- mkdir -p $GOPATH/src/git.feneas.org/ganggo
- ln -s $(pwd) $GOPATH/src/git.feneas.org/ganggo/ganggo
- make install
run unit tests:
stage: test
......@@ -76,12 +76,13 @@ linux:arm:7:
- export GOARM=7
- make release
deploy artifacts to bintray:
# NOTE deployment only works on protected branches!
before_script: []
stage: deploy
script:
- bash ci/scripts/bintray.sh
when: manual
allow_failure: true
only:
- /^v[\d\.]+-\w.*$/
dependencies:
- linux:amd64
- windows:amd64
......
sudo: required
language: go
go: "1.9.x"
services:
- postgresql
env:
global:
- UPDATE_CHANNEL=alpha
- PATH=$PATH:$GOPATH/bin
- VERSION=$(git describe --abbrev=0 --tags)
matrix:
- BUILD_GOOS=linux BUILD_GOARCH=amd64
before_install:
- psql -c 'create database ganggo;' -U postgres
after_script:
- psql -c 'drop database ganggo;' -U postgres
stages:
- test
- release
jobs:
include:
- stage: test
go_import_path: github.com/ganggo/ganggo
install:
- make install
script:
# if we define GOARCH, GOOS and GOARM directly
# it will be resetted after calling install/script function
# to avoid it we wrap the values in the BUILD-variables
- GOARCH=$BUILD_GOARCH GOOS=$BUILD_GOOS GOARM=$BUILD_GOARM make test
- stage: release
go_import_path: github.com/ganggo/ganggo
install:
- make install
script:
- GOARCH=$BUILD_GOARCH GOOS=$BUILD_GOOS GOARM=$BUILD_GOARM make release
before_deploy:
- export LABEL=$BUILD_GOOS-$BUILD_GOARCH.$UPDATE_CHANNEL
- if [ "$BUILD_GOARCH" == "arm"]; then LABEL=$LABEL"v"$BUILD_GOARM; fi
- if [ "$BUILD_GOOS" == "windows" ]; then LABEL=$LABEL".exe"; fi
- mv updater updater.$LABEL
deploy:
provider: releases
api_key:
secure: BeXZlawzicuTA9QF3RFE4OhpxK9EyPifSiW5KQhPEbkcq+DJeHXi+sXLY0jH3igbBWRU+PhVoeg6KjSTWhCoPy+mj3WuQ3TOgZ660lApBxzqbVyPyEYUoS+hJUETAIi5bQLLk9lt9VnWgD2rE8GvGPbZ//0OkYOL/NcY4wdFo3h6wYbJfWwdeettkrFAce+xjbSscxo8hzShy1UyP1aHq5P4XoUBm6dGCEc9R+AFSGNb0Cb8HFE0Jnp/2ZtMfkIqI4Et9tBp72a7W0tafXJ+ZMdvLg+1+aqH7Z6mL9pStVxXlgzwyd8L8FdI8tpDp09tyfN1fJB04Zk7dF8bpt5P5TyjZqO4m4zOQvq0ZTtfgwl3ZhFX07DjYiriDnZdMt+15xkg+hTCwug6RA0sJEKbVUJ8gqI+sN+SRw/l9VJPJ79FnnpKmkaK0z3De37QhL+HGIB/m/NWeDGKpu5+XNKaRZciy+Eh7V4zE0dWJT7a4XWl3burbj7B9cF28jqQL1MOgTw+B8VNzcpCljuBJwn2rsK3rcpj4gqstCIxCyM84zmS0TAevx+uz1DSBIxKa+qcFrUg6G2Puog4OV7vOaVI9kvI2h14eGvFKw5Ui3X5c5pgrfKbiM/+J7Uq3A9iSjHBheugryiyqwlilXtSrFHt8o51P/87/qkPmVRWAAKJBl0=
file: updater.$LABEL
skip_cleanup: true
on:
tags: true
......@@ -4,8 +4,24 @@
[[projects]]
name = "cloud.google.com/go"
packages = ["civil"]
revision = "777200caa7fb8936aed0f12b1fd79af64cc83ec9"
version = "v0.24.0"
revision = "aad3f485ee528456e0768f20397b4d9dd941e755"
version = "v0.25.0"
[[projects]]
branch = "master"
name = "git.feneas.org/ganggo/api"
packages = [
"app",
"app/controllers",
"app/helpers"
]
revision = "f4932ab8362e8e2a4e63aa88f07d17bed21f7134"
[[projects]]
branch = "master"
name = "git.feneas.org/ganggo/federation"
packages = ["."]
revision = "59eaaf5c998263705f44bc1706686515b5f028f5"
[[projects]]
name = "github.com/PuerkitoBio/goquery"
......@@ -53,6 +69,7 @@
"aws/signer/v4",
"internal/sdkio",
"internal/sdkrand",
"internal/sdkuri",
"internal/shareddefaults",
"private/protocol",
"private/protocol/eventstream",
......@@ -65,8 +82,8 @@
"service/s3",
"service/sts"
]
revision = "852052a10992d92f68b9a60862a3312292524903"
version = "v1.14.17"
revision = "9e9afa0895e9daff556cc18f90dc53eb91f41ffd"
version = "v1.14.26"
[[projects]]
name = "github.com/certifi/gocertifi"
......@@ -87,7 +104,7 @@
".",
"internal/cp"
]
revision = "3724b4745ca99cd0374ace516e93c022c00dfda9"
revision = "242fa5aa1b45aeb9fcdfeee88822982e3f548e22"
[[projects]]
name = "github.com/fatih/structs"
......@@ -95,22 +112,6 @@
revision = "a720dfa8df582c51dee1b36feabb906bde1588bd"
version = "v1.0"
[[projects]]
branch = "master"
name = "github.com/ganggo/api"
packages = [
"app",
"app/controllers",
"app/helpers"
]
revision = "76ef70519c7a7baf90804fededc1126528f269d5"
[[projects]]
branch = "master"
name = "github.com/ganggo/federation"
packages = ["."]
revision = "59eaaf5c998263705f44bc1706686515b5f028f5"
[[projects]]
branch = "master"
name = "github.com/getsentry/raven-go"
......@@ -120,8 +121,8 @@
[[projects]]
name = "github.com/go-ini/ini"
packages = ["."]
revision = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"
version = "v1.37.0"
revision = "358ee7663966325963d4e8b2e1fbd570c5195153"
version = "v1.38.1"
[[projects]]
name = "github.com/go-sql-driver/mysql"
......@@ -168,8 +169,8 @@
"gzip",
"zlib"
]
revision = "5fb1f31b0a61e9858f12f39266e059848a5f1cea"
version = "v1.3.0"
revision = "b939724e787a27c0005cabe3f78e7ed7987ac74f"
version = "v1.4.0"
[[projects]]
name = "github.com/klauspost/cpuid"
......@@ -305,13 +306,13 @@
"html/atom",
"websocket"
]
revision = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9"
revision = "d0887baf81f4598189d4e12a37c6da86f0bba4d0"
[[projects]]
branch = "master"
name = "golang.org/x/sys"
packages = ["unix"]
revision = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"
revision = "1b2967e3c290b7c545b3db0deeda16e9be4f98a2"
[[projects]]
name = "google.golang.org/appengine"
......@@ -326,8 +327,8 @@
"core",
"terminal"
]
revision = "db8e629a54ae1a4442be0deae7be60062c69d111"
version = "v1.6.0"
revision = "17861e192dc11fd2f5081df1932c94cce262fa1e"
version = "v1.6.1"
[[projects]]
name = "gopkg.in/fsnotify/fsnotify.v1"
......@@ -362,6 +363,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "86921838c2c160e5e2b830a9252ed2997990ccd2a2d906e37a37fc5349201c35"
inputs-digest = "04468b6173142c89caa5e22e90c6af57fdf861768634cf0be4a8f5d8815e1b6d"
solver-name = "gps-cdcl"
solver-version = 1
......@@ -24,11 +24,11 @@ required = ["github.com/revel/cmd/revel"]
[[override]]
branch = "master"
name = "github.com/ganggo/api"
name = "git.feneas.org/ganggo/api"
[[override]]
branch = "master"
name = "github.com/ganggo/federation"
name = "git.feneas.org/ganggo/federation"
[[override]]
branch = "master"
......
......@@ -3,7 +3,7 @@
SHELL=/bin/bash
version := $(shell echo -n $(VERSION) |cut -d- -f1)
package := github.com/ganggo/ganggo
package := git.feneas.org/ganggo/ganggo
srcdir := $(GOPATH)/src/$(package)
go := $(shell command -v go 2> /dev/null)
......
......@@ -8,7 +8,7 @@ GangGo is a decentralized social network written in [GoLang](https://golang.org/
## Selfhost
Fetch the latest updater version from [github.com/ganggo/ganggo/releases](https://github.com/ganggo/ganggo/releases) and execute it. It will come with a small installation wizard and guide you through the first steps.
Fetch the latest updater version [![Download](https://api.bintray.com/packages/ganggo/ganggo/alpha/images/download.svg)](https://bintray.com/ganggo/ganggo/alpha/_latestVersion) and execute it. It will come with a small installation wizard and guide you through the first steps.
There is also a small installation video for how to quick-start with our updater binary on [ganggo.github.io](https://ganggo.github.io/)!
......
......@@ -21,9 +21,9 @@ import (
"net/http"
"encoding/xml"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"github.com/ganggo/ganggo/app/helpers"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/helpers"
federation "git.feneas.org/ganggo/federation"
"strings"
)
......
......@@ -19,7 +19,7 @@ package controllers
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/models"
)
type Hcard struct {
......
......@@ -19,7 +19,7 @@ package controllers
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/models"
)
func init() {
......
......@@ -19,8 +19,8 @@ package controllers
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app"
"git.feneas.org/ganggo/ganggo/app/models"
)
type NodeInfo struct {
......
......@@ -19,7 +19,7 @@ package controllers
import (
"github.com/revel/revel"
api "github.com/ganggo/api/app/controllers"
api "git.feneas.org/ganggo/api/app/controllers"
)
type People struct {
......
......@@ -19,7 +19,7 @@ package controllers
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/models"
)
type Post struct {
......
......@@ -19,7 +19,7 @@ package controllers
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/models"
)
type Profile struct {
......
......@@ -20,10 +20,10 @@ package controllers
import (
"net/http"
"github.com/revel/revel"
federation "github.com/ganggo/federation"
federation "git.feneas.org/ganggo/federation"
run "github.com/revel/modules/jobs/app/jobs"
"github.com/ganggo/ganggo/app/models"
"github.com/ganggo/ganggo/app/jobs"
"git.feneas.org/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/jobs"
"io/ioutil"
)
......
......@@ -20,9 +20,9 @@ package controllers
import (
"strings"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/helpers"
"github.com/ganggo/ganggo/app/jobs"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/helpers"
"git.feneas.org/ganggo/ganggo/app/jobs"
"git.feneas.org/ganggo/ganggo/app/models"
)
type Search struct {
......
......@@ -19,7 +19,7 @@ package controllers
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/models"
)
type Setting struct {
......
......@@ -19,7 +19,7 @@ package controllers
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/models"
)
type Stream struct {
......
......@@ -20,7 +20,7 @@ package controllers
import (
"sort"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/models"
)
type Tag struct {
......
......@@ -20,8 +20,8 @@ package controllers
import (
"github.com/revel/revel"
"github.com/dchest/captcha"
"github.com/ganggo/ganggo/app/models"
"github.com/ganggo/ganggo/app/helpers"
"git.feneas.org/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/helpers"
"net/http"
)
......
......@@ -20,8 +20,8 @@ package controllers
import (
"net/http"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
"errors"
)
......
......@@ -20,7 +20,7 @@ package helpers
import (
"fmt"
"github.com/revel/revel"
federation "github.com/ganggo/federation"
federation "git.feneas.org/ganggo/federation"
"github.com/revel/log15"
"github.com/getsentry/raven-go"
)
......
......@@ -21,12 +21,12 @@ import (
"io/ioutil"
"encoding/json"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/helpers"
"github.com/ganggo/ganggo/app/models"
"github.com/ganggo/ganggo/app/views"
"github.com/ganggo/ganggo/app/jobs"
"git.feneas.org/ganggo/ganggo/app/helpers"
"git.feneas.org/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/views"
"git.feneas.org/ganggo/ganggo/app/jobs"
run "github.com/revel/modules/jobs/app/jobs"
federation "github.com/ganggo/federation"
federation "git.feneas.org/ganggo/federation"
"net/http"
"strings"
"fmt"
......
......@@ -20,8 +20,8 @@ package jobs
import (
"encoding/xml"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
)
func (dispatcher *Dispatcher) Comment(comment federation.EntityComment) {
......
......@@ -21,9 +21,9 @@ import (
"encoding/xml"
"github.com/revel/revel"
run "github.com/revel/modules/jobs/app/jobs"
"github.com/ganggo/ganggo/app/models"
"github.com/ganggo/ganggo/app/helpers"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/helpers"
federation "git.feneas.org/ganggo/federation"
)
func (dispatcher *Dispatcher) Contact(contact federation.EntityContact) {
......
......@@ -20,8 +20,8 @@ package jobs
import (
"encoding/xml"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
)
func (dispatcher *Dispatcher) Like(like federation.EntityLike) {
......
......@@ -20,8 +20,8 @@ package jobs
import (
"encoding/xml"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
)
func (dispatcher *Dispatcher) Reshare(reshare federation.EntityReshare) {
......
......@@ -20,8 +20,8 @@ package jobs
import (
"encoding/xml"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
"strings"
)
......
......@@ -20,9 +20,9 @@ package jobs
import (
"crypto/rsa"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"github.com/ganggo/ganggo/app/helpers"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/helpers"
federation "git.feneas.org/ganggo/federation"
run "github.com/revel/modules/jobs/app/jobs"
"bytes"
)
......
......@@ -20,9 +20,9 @@ package jobs
import (
"errors"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"github.com/ganggo/ganggo/app/helpers"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/helpers"
federation "git.feneas.org/ganggo/federation"
)
type FetchAuthor struct {
......
......@@ -19,8 +19,8 @@ package jobs
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
run "github.com/revel/modules/jobs/app/jobs"
)
......
......@@ -19,8 +19,8 @@ package jobs
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
)
func (receiver *Receiver) Contact(entity federation.EntityContact) {
......
......@@ -19,8 +19,8 @@ package jobs
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
run "github.com/revel/modules/jobs/app/jobs"
)
......
......@@ -19,8 +19,8 @@ package jobs
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
)
func (receiver *Receiver) Reshare(entity federation.EntityReshare) {
......
......@@ -19,9 +19,9 @@ package jobs
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/helpers"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/helpers"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
"strings"
)
......
......@@ -20,8 +20,8 @@ package jobs
import (
"strings"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
)
func (r *Receiver) Retraction(retraction federation.EntityRetraction) {
......
......@@ -19,8 +19,8 @@ package jobs
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
)
type Receiver struct {
......
......@@ -19,8 +19,8 @@ package jobs
import (
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/models"
federation "git.feneas.org/ganggo/federation"
"strings"
"fmt"
)
......
......@@ -20,7 +20,7 @@ package jobs
import (
"time"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/models"
"git.feneas.org/ganggo/ganggo/app/models"
)
type Session struct {}
......
......@@ -20,7 +20,7 @@ package models
import (
"time"
"github.com/revel/revel"
federation "github.com/ganggo/federation"
federation "git.feneas.org/ganggo/federation"
"gopkg.in/ganggo/gorm.v2"
)
......
......@@ -19,8 +19,8 @@ package models
import (
"time"
"github.com/ganggo/ganggo/app/helpers"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/helpers"
federation "git.feneas.org/ganggo/federation"
"gopkg.in/ganggo/gorm.v2"
)
......
......@@ -21,7 +21,7 @@ import (
"time"
"errors"
"github.com/revel/revel"
"github.com/ganggo/ganggo/app/helpers"
"git.feneas.org/ganggo/ganggo/app/helpers"
"gopkg.in/ganggo/gorm.v2"
_ "gopkg.in/ganggo/gorm.v2/dialects/postgres"
_ "gopkg.in/ganggo/gorm.v2/dialects/mssql"
......
......@@ -20,7 +20,7 @@ package models
import (
"time"
"github.com/revel/revel"
federation "github.com/ganggo/federation"
federation "git.feneas.org/ganggo/federation"
"gopkg.in/ganggo/gorm.v2"
)
......
......@@ -19,7 +19,7 @@ package models
import (
"time"
federation "github.com/ganggo/federation"
federation "git.feneas.org/ganggo/federation"
)
type Photo struct {
......
......@@ -20,7 +20,7 @@ package models
import (
"time"
"gopkg.in/ganggo/gorm.v2"
federation "github.com/ganggo/federation"
federation "git.feneas.org/ganggo/federation"
"github.com/revel/revel"
)
......
......@@ -19,8 +19,8 @@ package models
import (
"time"
"github.com/ganggo/ganggo/app/helpers"
federation "github.com/ganggo/federation"
"git.feneas.org/ganggo/ganggo/app/helpers"
federation "git.feneas.org/ganggo/federation"
"github.com/revel/revel"
)
......
......@@ -29,7 +29,7 @@ import (
"crypto/x509"
"encoding/pem"
"golang.org/x/crypto/bcrypt"
"github.com/ganggo/ganggo/app/helpers"
"git.feneas.org/ganggo/ganggo/app/helpers"
)
type User struct {
......
......@@ -17,11 +17,11 @@
<div class="row">
<div class="col">
<h2><i class="fa fa-cloud" aria-hidden="true"></i> Decentralization</h2>