diff options
| -rw-r--r-- | .github/workflows/golang-test-lint.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | bskyweb/Makefile | 3 | ||||
| -rw-r--r-- | bskyweb/README.md | 2 | ||||
| -rw-r--r-- | bskyweb/go.mod | 2 | ||||
| -rw-r--r-- | bskyweb/go.sum | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/golang-test-lint.yml b/.github/workflows/golang-test-lint.yml index 096d1b933..2576c3479 100644 --- a/.github/workflows/golang-test-lint.yml +++ b/.github/workflows/golang-test-lint.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go tooling uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.21' - name: Dummy JS File run: touch bskyweb/static/js/blah.js - name: Check @@ -36,7 +36,7 @@ jobs: - name: Set up Go tooling uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.21' - name: Dummy JS File run: touch bskyweb/static/js/blah.js - name: Lint diff --git a/Dockerfile b/Dockerfile index 241926db4..388b742cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-bullseye AS build-env +FROM golang:1.21-bullseye AS build-env WORKDIR /usr/src/social-app @@ -13,6 +13,7 @@ ENV GODEBUG="netdns=go" ENV GOOS="linux" ENV GOARCH="amd64" ENV CGO_ENABLED=1 +ENV GOEXPERIMENT="loopvar" COPY . . diff --git a/bskyweb/Makefile b/bskyweb/Makefile index 7561a1454..e0ba8aec0 100644 --- a/bskyweb/Makefile +++ b/bskyweb/Makefile @@ -2,6 +2,9 @@ SHELL = /bin/bash .SHELLFLAGS = -o pipefail -c +# https://github.com/golang/go/wiki/LoopvarExperiment +export GOEXPERIMENT := loopvar + .PHONY: help help: ## Print info about all commands @echo "Commands:" diff --git a/bskyweb/README.md b/bskyweb/README.md index d60647379..c8efe0448 100644 --- a/bskyweb/README.md +++ b/bskyweb/README.md @@ -24,7 +24,7 @@ Then build and copy over the big 'ol `bundle.web.js` file: ### Golang Daemon -Install golang. We are generally using v1.20+. +Install golang. We are generally using v1.21+. In this directory (`bskyweb/`): diff --git a/bskyweb/go.mod b/bskyweb/go.mod index 5f06bfc45..bc513727c 100644 --- a/bskyweb/go.mod +++ b/bskyweb/go.mod @@ -1,6 +1,6 @@ module github.com/bluesky-social/social-app/bskyweb -go 1.20 +go 1.21 require ( github.com/bluesky-social/indigo v0.0.0-20230504025040-8915cccc3319 diff --git a/bskyweb/go.sum b/bskyweb/go.sum index ae5d7defb..a07e446f4 100644 --- a/bskyweb/go.sum +++ b/bskyweb/go.sum @@ -31,6 +31,7 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -240,6 +241,7 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= |