Browse Source

Migrate to GitLab

wip
Trevor Slocum 3 years ago
parent
commit
3b84b23ebd
  1. 17
      .builds/amd64_freebsd.yml
  2. 17
      .builds/amd64_linux_alpine.yml
  3. 8
      .gitlab-ci.yml
  4. 2
      HOSTING.md
  5. 8
      README.md
  6. 4
      cmd/harmony-server/main.go
  7. 2
      go.mod
  8. 2
      goreleaser.yml
  9. 2
      pkg/agent/client.go
  10. 4
      pkg/web/web.go

17
.builds/amd64_freebsd.yml

@ -1,17 +0,0 @@
arch: amd64
environment:
PROJECT_NAME: 'harmony'
CGO_ENABLED: '1'
GO111MODULE: 'on'
image: freebsd/latest
packages:
- go
sources:
- https://git.sr.ht/~tslocum/harmony
tasks:
- test: |
cd $PROJECT_NAME
go test ./...
- build-server: |
cd $PROJECT_NAME/cmd/harmony-server
go build

17
.builds/amd64_linux_alpine.yml

@ -1,17 +0,0 @@
arch: x86_64
environment:
PROJECT_NAME: 'harmony'
CGO_ENABLED: '1'
GO111MODULE: 'on'
image: alpine/edge
packages:
- go
sources:
- https://git.sr.ht/~tslocum/harmony
tasks:
- test: |
cd $PROJECT_NAME
go test ./...
- build-server: |
cd $PROJECT_NAME/cmd/harmony-server
go build

8
.gitlab-ci.yml

@ -0,0 +1,8 @@
stages:
- test
test:
image: golang:latest
stage: test
script:
- go test -v ./...

2
HOSTING.md

@ -47,7 +47,7 @@ There are two ways to install harmony-server:
Download and install the [Go compiler](https://golang.org/doc/install), then
install harmony-server with the following command:
```GO111MODULE=on go get git.sr.ht/~tslocum/harmony/...@latest```
```GO111MODULE=on go get gitlab.com/tslocum/harmony/...```
This command will also update the server when ran again.

8
README.md

@ -1,6 +1,6 @@
# harmony
[![GoDoc](https://godoc.org/git.sr.ht/~tslocum/harmony?status.svg)](https://godoc.org/git.sr.ht/~tslocum/harmony)
[![builds.sr.ht status](https://builds.sr.ht/~tslocum/harmony.svg)](https://builds.sr.ht/~tslocum/harmony)
[![GoDoc](https://godoc.org/gitlab.com/tslocum/harmony?status.svg)](https://godoc.org/gitlab.com/tslocum/harmony)
[![CI status](https://gitlab.com/tslocum/harmony/badges/master/pipeline.svg)](https://gitlab.com/tslocum/harmony/commits/master)
[![Donate](https://img.shields.io/liberapay/receives/rocketnine.space.svg?logo=liberapay)](https://liberapay.com/rocketnine.space)
Voice and text communications platform
@ -26,12 +26,12 @@ hosted by the server.
The server (located in cmd/harmony-server) passes voice and text communications
between clients.
See [HOSTING.md](https://man.sr.ht/~tslocum/harmony/HOSTING.md) for information
See [HOSTING.md](https://gitlab.com/tslocum/harmony/blob/master/HOSTING.md) for information
on hosting a server.
## Support
Please share suggestions/issues [here](https://todo.sr.ht/~tslocum/harmony).
Please share issues/suggestions [here](https://gitlab.com/tslocum/harmony/issues).
## Libraries

4
cmd/harmony-server/main.go

@ -9,8 +9,8 @@ import (
"path"
"strings"
"git.sr.ht/~tslocum/harmony/pkg/agent"
"git.sr.ht/~tslocum/harmony/pkg/web"
"gitlab.com/tslocum/harmony/pkg/agent"
"gitlab.com/tslocum/harmony/pkg/web"
)
var (

2
go.mod

@ -1,4 +1,4 @@
module git.sr.ht/~tslocum/harmony
module gitlab.com/tslocum/harmony
go 1.13

2
goreleaser.yml

@ -15,7 +15,7 @@ builds:
flags:
- -tags=embed
ldflags:
- -s -w -X git.sr.ht/~tslocum/harmony/pkg/config.Version={{.Version}}
- -s -w -X gitlab.com/tslocum/harmony/pkg/config.Version={{.Version}}
goos:
# - darwin
# - freebsd

2
pkg/agent/client.go

@ -6,9 +6,9 @@ import (
"sync"
"time"
"git.sr.ht/~tslocum/harmony/pkg/audio"
"github.com/gorilla/websocket"
"github.com/pion/webrtc/v2"
"gitlab.com/tslocum/harmony/pkg/audio"
)
type Client struct {

4
pkg/web/web.go

@ -12,14 +12,14 @@ import (
"sync"
"time"
"git.sr.ht/~tslocum/harmony/pkg/agent"
"git.sr.ht/~tslocum/harmony/pkg/audio"
"github.com/gorilla/mux"
"github.com/gorilla/websocket"
"github.com/pion/rtp"
"github.com/pion/webrtc/v2"
"github.com/pkg/errors"
"gitlab.com/golang-commonmark/markdown"
"gitlab.com/tslocum/harmony/pkg/agent"
"gitlab.com/tslocum/harmony/pkg/audio"
)
var peerConnectionConfig = webrtc.Configuration{

Loading…
Cancel
Save