Skip to content

Commit

Permalink
[chore] update dependencies, bump to Go 1.19.1 (#826)
Browse files Browse the repository at this point in the history
* update dependencies, bump Go version to 1.19

* bump test image Go version

* update golangci-lint

* update gotosocial-drone-build

* sign

* linting, go fmt

* update swagger docs

* update swagger docs

* whitespace

* update contributing.md

* fuckin whoopsie doopsie

* linterino, linteroni

* fix followrequest test not starting processor

* fix other api/client tests not starting processor

* fix remaining tests where processor not started

* bump go-runners version

* don't check last-webfingered-at, processor may have updated this

* update swagger command

* update bun to latest version

* fix embed to work the same as before with new bun

Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
  • Loading branch information
NyaaaWhatsUpDoc and tsmethurst committed Sep 28, 2022
1 parent 00d3885 commit a156188
Show file tree
Hide file tree
Showing 1,135 changed files with 259,017 additions and 137,258 deletions.
12 changes: 6 additions & 6 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:
# We use golangci-lint for linting.
# See: https://golangci-lint.run/
- name: lint
image: golangci/golangci-lint:v1.45.2
image: golangci/golangci-lint:v1.49.0
volumes:
- name: go-build-cache
path: /root/.cache/go-build
Expand All @@ -28,7 +28,7 @@ steps:
- pull_request

- name: test
image: golang:1.18.3-alpine
image: golang:1.19.1-alpine
volumes:
- name: go-build-cache
path: /root/.cache/go-build
Expand All @@ -45,7 +45,7 @@ steps:
- pull_request

- name: snapshot
image: superseriousbusiness/gotosocial-drone-build:0.0.5 # https://github.com/superseriousbusiness/gotosocial-drone-build
image: superseriousbusiness/gotosocial-drone-build:0.0.6 # https://github.com/superseriousbusiness/gotosocial-drone-build
volumes:
- name: go-build-cache
path: /root/.cache/go-build
Expand Down Expand Up @@ -74,7 +74,7 @@ steps:
- main

- name: release
image: superseriousbusiness/gotosocial-drone-build:0.0.5 # https://github.com/superseriousbusiness/gotosocial-drone-build
image: superseriousbusiness/gotosocial-drone-build:0.0.6 # https://github.com/superseriousbusiness/gotosocial-drone-build
volumes:
- name: go-build-cache
path: /root/.cache/go-build
Expand Down Expand Up @@ -133,7 +133,7 @@ clone:

steps:
- name: mirror
image: superseriousbusiness/gotosocial-drone-build:0.0.5
image: superseriousbusiness/gotosocial-drone-build:0.0.6
environment:
ORIGIN_REPO: https://github.com/superseriousbusiness/gotosocial
TARGET_REPO: https://codeberg.org/superseriousbusiness/gotosocial
Expand All @@ -146,6 +146,6 @@ steps:

---
kind: signature
hmac: d696d93f3d1583b9815488fcd2ff1ade53a5d7512abac63f16bd8cd0079f03a5
hmac: 59bf8f7a44f7c87e795b8a03a528c4cef0249815370c8bacaa3186f78c82e87c

...
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ before:
# https://goreleaser.com/customization/hooks/
hooks:
# generate the swagger.yaml file using go-swagger and bundle it into the assets directory
- swagger generate spec -o web/assets/swagger.yaml --scan-models
- swagger generate spec --scan-models --exclude-deps -o web/assets/swagger.yaml
- sed -i "s/REPLACE_ME/{{ incpatch .Version }}/" web/assets/swagger.yaml
# bundle web assets
- yarn install --cwd web/source
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ In lieu of a fuller code of conduct, here are a few ground rules.

## Setting up your development environment

To get started, you first need to have Go installed. GtS is currently using Go 1.18, so you should take that too. See [here](https://golang.org/doc/install).
To get started, you first need to have Go installed. GtS is currently using Go 1.19, so you should take that too. See [here](https://golang.org/doc/install).

Once you've got go installed, clone this repository into your Go path. Normally, this should be `~/go/src/github.com/superseriousbusiness/gotosocial`.

Expand Down Expand Up @@ -244,7 +244,7 @@ You can install go-swagger following the instructions [here](https://goswagger.i
If you change Swagger annotations on any of the API paths, you can generate a new Swagger file at `./docs/api/swagger.yaml` by running:

```bash
swagger generate spec -o docs/api/swagger.yaml --scan-models
swagger generate spec --scan-models --exclude-deps -o docs/api/swagger.yaml
```

## CI/CD configuration
Expand Down
4 changes: 2 additions & 2 deletions cmd/gotosocial/action/testrig/testrig.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"bytes"
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"os/signal"
Expand Down Expand Up @@ -86,7 +86,7 @@ var Start action.GTSAction = func(ctx context.Context) error {
// build backend handlers
oauthServer := testrig.NewTestOauthServer(dbService)
transportController := testrig.NewTestTransportController(testrig.NewMockHTTPClient(func(req *http.Request) (*http.Response, error) {
r := ioutil.NopCloser(bytes.NewReader([]byte{}))
r := io.NopCloser(bytes.NewReader([]byte{}))
return &http.Response{
StatusCode: 200,
Body: r,
Expand Down

0 comments on commit a156188

Please sign in to comment.