From 3b84b23ebd386de2a14e1ec3c186315a8a99cb01 Mon Sep 17 00:00:00 2001 From: Trevor Slocum Date: Wed, 22 Jan 2020 17:40:22 -0800 Subject: [PATCH] Migrate to GitLab --- .builds/amd64_freebsd.yml | 17 ----------------- .builds/amd64_linux_alpine.yml | 17 ----------------- .gitlab-ci.yml | 8 ++++++++ HOSTING.md | 2 +- README.md | 8 ++++---- cmd/harmony-server/main.go | 4 ++-- go.mod | 2 +- goreleaser.yml | 2 +- pkg/agent/client.go | 2 +- pkg/web/web.go | 4 ++-- 10 files changed, 20 insertions(+), 46 deletions(-) delete mode 100644 .builds/amd64_freebsd.yml delete mode 100644 .builds/amd64_linux_alpine.yml create mode 100644 .gitlab-ci.yml diff --git a/.builds/amd64_freebsd.yml b/.builds/amd64_freebsd.yml deleted file mode 100644 index e433b0f..0000000 --- a/.builds/amd64_freebsd.yml +++ /dev/null @@ -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 diff --git a/.builds/amd64_linux_alpine.yml b/.builds/amd64_linux_alpine.yml deleted file mode 100644 index a7ac9ae..0000000 --- a/.builds/amd64_linux_alpine.yml +++ /dev/null @@ -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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..e66f95d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +stages: + - test + +test: + image: golang:latest + stage: test + script: + - go test -v ./... diff --git a/HOSTING.md b/HOSTING.md index 5076db6..3438e6f 100644 --- a/HOSTING.md +++ b/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. diff --git a/README.md b/README.md index 477ba23..c656a79 100644 --- a/README.md +++ b/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 diff --git a/cmd/harmony-server/main.go b/cmd/harmony-server/main.go index 5ac3369..9e8b2bb 100644 --- a/cmd/harmony-server/main.go +++ b/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 ( diff --git a/go.mod b/go.mod index bedbc4d..deaf46a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.sr.ht/~tslocum/harmony +module gitlab.com/tslocum/harmony go 1.13 diff --git a/goreleaser.yml b/goreleaser.yml index b041960..032729e 100644 --- a/goreleaser.yml +++ b/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 diff --git a/pkg/agent/client.go b/pkg/agent/client.go index 35e87da..7196ec5 100644 --- a/pkg/agent/client.go +++ b/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 { diff --git a/pkg/web/web.go b/pkg/web/web.go index 278a918..1cdc276 100644 --- a/pkg/web/web.go +++ b/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{