From 40be88ec609c9b5352cbb7d38fd70ff7c6a233a5 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 7 Feb 2022 15:22:55 +0100 Subject: [PATCH] [chore] Drone config update (#383) * go mod tidy * reformat triggers * add drone build status to readme --- .drone.yml | 179 ++++++++++++++++++++++++++--------------------------- README.md | 2 +- go.mod | 2 +- 3 files changed, 90 insertions(+), 93 deletions(-) diff --git a/.drone.yml b/.drone.yml index c87509862..d864ea60c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,112 +10,109 @@ type: docker name: default steps: -# We use golangci-lint for linting. -# See: https://golangci-lint.run/ -- name: lint - image: golangci/golangci-lint:v1.43.0 - volumes: - - name: go-build-cache - path: /root/.cache/go-build - - name: golangci-lint-cache - path: /root/.cache/golangci-lint - - name: go-src - path: /go - commands: - - golangci-lint run - when: - event: - include: - - pull_request + # We use golangci-lint for linting. + # See: https://golangci-lint.run/ + - name: lint + image: golangci/golangci-lint:v1.43.0 + volumes: + - name: go-build-cache + path: /root/.cache/go-build + - name: golangci-lint-cache + path: /root/.cache/golangci-lint + - name: go-src + path: /go + commands: + - golangci-lint run + when: + event: + include: + - pull_request -- name: test - image: golang:1.17.5-alpine3.14 - volumes: - - name: go-build-cache - path: /root/.cache/go-build - - name: go-src - path: /go - commands: - - CGO_ENABLED=0 GTS_DB_TYPE="sqlite" GTS_DB_ADDRESS=":memory:" go test ./... - - CGO_ENABLED=0 ./test/cliparsing.sh - when: - event: - include: - - pull_request + - name: test + image: golang:1.17.5-alpine3.14 + volumes: + - name: go-build-cache + path: /root/.cache/go-build + - name: go-src + path: /go + commands: + - CGO_ENABLED=0 GTS_DB_TYPE="sqlite" GTS_DB_ADDRESS=":memory:" go test ./... + - CGO_ENABLED=0 ./test/cliparsing.sh + when: + event: + include: + - pull_request -- name: snapshot - image: superseriousbusiness/gotosocial-drone-build:0.0.1 # https://github.com/superseriousbusiness/gotosocial-drone-build - volumes: - - name: go-build-cache - path: /root/.cache/go-build - - name: docker - path: /var/run/docker.sock - environment: - DOCKER_USERNAME: gotosocial - DOCKER_PASSWORD: - from_secret: gts_docker_password - commands: - - git fetch --tags - - /go/dockerlogin.sh - - goreleaser release --rm-dist --snapshot - - docker push superseriousbusiness/gotosocial:latest - when: - event: - include: - - push - branch: - include: - - main + - name: snapshot + image: superseriousbusiness/gotosocial-drone-build:0.0.1 # https://github.com/superseriousbusiness/gotosocial-drone-build + volumes: + - name: go-build-cache + path: /root/.cache/go-build + - name: docker + path: /var/run/docker.sock + environment: + DOCKER_USERNAME: gotosocial + DOCKER_PASSWORD: + from_secret: gts_docker_password + commands: + - git fetch --tags + - /go/dockerlogin.sh + - goreleaser release --rm-dist --snapshot + - docker push superseriousbusiness/gotosocial:latest + when: + event: + include: + - push + branch: + include: + - main -- name: release - image: superseriousbusiness/gotosocial-drone-build:0.0.1 # https://github.com/superseriousbusiness/gotosocial-drone-build - volumes: - - name: go-build-cache - path: /root/.cache/go-build - - name: docker - path: /var/run/docker.sock - environment: - DOCKER_USERNAME: gotosocial - DOCKER_PASSWORD: - from_secret: gts_docker_password - GITHUB_TOKEN: - from_secret: github_token - commands: - - git fetch --tags - - /go/dockerlogin.sh - - goreleaser release --rm-dist - when: - event: - include: - - tag + - name: release + image: superseriousbusiness/gotosocial-drone-build:0.0.1 # https://github.com/superseriousbusiness/gotosocial-drone-build + volumes: + - name: go-build-cache + path: /root/.cache/go-build + - name: docker + path: /var/run/docker.sock + environment: + DOCKER_USERNAME: gotosocial + DOCKER_PASSWORD: + from_secret: gts_docker_password + GITHUB_TOKEN: + from_secret: github_token + commands: + - git fetch --tags + - /go/dockerlogin.sh + - goreleaser release --rm-dist + when: + event: + include: + - tag # We can speed up builds significantly by caching build artifacts between runs. # See: https://docs.drone.io/pipeline/docker/syntax/volumes/host/ volumes: -- name: go-build-cache - host: - path: /drone/gotosocial/go-build -- name: golangci-lint-cache - host: - path: /drone/gotosocial/golangci-lint -- name: go-src - host: - path: /drone/gotosocial/go -- name: docker - host: - path: /var/run/docker.sock + - name: go-build-cache + host: + path: /drone/gotosocial/go-build + - name: golangci-lint-cache + host: + path: /drone/gotosocial/golangci-lint + - name: go-src + host: + path: /drone/gotosocial/go + - name: docker + host: + path: /var/run/docker.sock trigger: repo: - exclude: - - "*" - include: - superseriousbusiness/gotosocial - NyaaaWhatsUpDoc/gotosocial - f0x52/gotosocial --- kind: signature -hmac: 6229aa9f503d87f4f6043a97eab2a73cb7ae466eb89eeb6479692aabc1c0f6c1 +hmac: f6372893445074c19e33057cf2cb94ddc9b5c54108094f9bfd40aae7c501f87c ... diff --git a/README.md b/README.md index ae50e9f0d..ac9bcd0f2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # GoToSocial -![patrons](https://img.shields.io/liberapay/patrons/GoToSocial.svg?logo=liberapay) ![receives](https://img.shields.io/liberapay/receives/GoToSocial.svg?logo=liberapay) +![patrons](https://img.shields.io/liberapay/patrons/GoToSocial.svg?logo=liberapay) ![receives](https://img.shields.io/liberapay/receives/GoToSocial.svg?logo=liberapay) [![Build Status](https://drone.superseriousbusiness.org/api/badges/superseriousbusiness/gotosocial/status.svg?ref=refs/heads/main)](https://drone.superseriousbusiness.org/superseriousbusiness/gotosocial) GoToSocial is an [ActivityPub](https://activitypub.rocks/) social network server, written in Golang. diff --git a/go.mod b/go.mod index 019607977..e7df8672e 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/superseriousbusiness/gotosocial go 1.17 require ( + codeberg.org/gruf/go-errors v1.0.4 codeberg.org/gruf/go-store v1.1.5 github.com/ReneKroon/ttlcache v1.7.0 github.com/buckket/go-blurhash v1.1.0 @@ -45,7 +46,6 @@ require ( require ( codeberg.org/gruf/go-bytes v1.0.2 // indirect - codeberg.org/gruf/go-errors v1.0.4 // indirect codeberg.org/gruf/go-fastpath v1.0.2 // indirect codeberg.org/gruf/go-hashenc v1.0.1 // indirect codeberg.org/gruf/go-logger v1.3.2 // indirect