zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

update golang to v1.21; set GOEXPERIMENT=loopvar (#1256) 

* golang: update to v1.21, and set GOEXPERIMENT=loopvar

* golang: go mod tidy
zio/stable
bnewbold 2023-08-28 19:35:23 -07:00 committed by GitHub
parent 40e030793a
commit 461c1da6de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/golang-test-lint.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Set up Go tooling - name: Set up Go tooling
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: '1.20' go-version: '1.21'
- name: Dummy JS File - name: Dummy JS File
run: touch bskyweb/static/js/blah.js run: touch bskyweb/static/js/blah.js
- name: Check - name: Check
@ -36,7 +36,7 @@ jobs:
- name: Set up Go tooling - name: Set up Go tooling
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: '1.20' go-version: '1.21'
- name: Dummy JS File - name: Dummy JS File
run: touch bskyweb/static/js/blah.js run: touch bskyweb/static/js/blah.js
- name: Lint - name: Lint

3
Dockerfile
View File

@ -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 WORKDIR /usr/src/social-app
@ -13,6 +13,7 @@ ENV GODEBUG="netdns=go"
ENV GOOS="linux" ENV GOOS="linux"
ENV GOARCH="amd64" ENV GOARCH="amd64"
ENV CGO_ENABLED=1 ENV CGO_ENABLED=1
ENV GOEXPERIMENT="loopvar"
COPY . . COPY . .

3
bskyweb/Makefile
View File

@ -2,6 +2,9 @@
SHELL = /bin/bash SHELL = /bin/bash
.SHELLFLAGS = -o pipefail -c .SHELLFLAGS = -o pipefail -c
# https://github.com/golang/go/wiki/LoopvarExperiment
export GOEXPERIMENT := loopvar
.PHONY: help .PHONY: help
help: ## Print info about all commands help: ## Print info about all commands
@echo "Commands:" @echo "Commands:"

2
bskyweb/README.md
View File

@ -24,7 +24,7 @@ Then build and copy over the big 'ol `bundle.web.js` file:
### Golang Daemon ### Golang Daemon
Install golang. We are generally using v1.20+. Install golang. We are generally using v1.21+.
In this directory (`bskyweb/`): In this directory (`bskyweb/`):

2
bskyweb/go.mod
View File

@ -1,6 +1,6 @@
module github.com/bluesky-social/social-app/bskyweb module github.com/bluesky-social/social-app/bskyweb
go 1.20 go 1.21
require ( require (
github.com/bluesky-social/indigo v0.0.0-20230504025040-8915cccc3319 github.com/bluesky-social/indigo v0.0.0-20230504025040-8915cccc3319

2
bskyweb/go.sum
View File

@ -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/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.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 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/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.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= 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/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-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 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.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=