From 31243b2a5b559a3732cbdde2912c1786b8226098 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Fri, 10 Mar 2023 11:27:06 +0100 Subject: [PATCH] feat(release): prepare release routine --- .drone.yml | 22 +++++++++++-- .gitignore | 2 ++ .goreleaser.yml | 63 ++++++++++++++++++++++++++++++++++++++ build/go.sum | 1 + build/release.go | 23 ++++++++++++++ build/tools.go | 4 ++- go.mod | 2 ++ go.sum | 8 +++-- go.work.sum | 13 -------- nitters/gitea/pr_nitter.go | 1 - 10 files changed, 120 insertions(+), 19 deletions(-) create mode 100644 .goreleaser.yml create mode 100644 build/release.go delete mode 100644 go.work.sum diff --git a/.drone.yml b/.drone.yml index 954c85c..7b69eac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ trigger: steps: - name: Setup - image: docker.io/golang:1.20-bullseye + image: docker.io/golang:1.20-alpine network_mode: host commands: - go mod download @@ -37,11 +37,11 @@ steps: path: /go - name: Test + # has to be debian based for gcc image: docker.io/golang:1.20-bullseye network_mode: host environment: CGO_ENABLED: "1" - DOCKER_HOST: tcp://localhost:2375 commands: - go install gotest.tools/gotestsum@latest - gotestsum --junitfile out/results.xml --format pkgname-and-test-fails -- -race -shuffle=on ./... @@ -58,6 +58,24 @@ steps: depends_on: - Test + - name: Release + image: ghcr.io/goreleaser/goreleaser + network_mode: host + environment: + CGO_ENABLED: "0" + GITEA_TOKEN: + from_secret: gitea_token + commands: + - git fetch --tags + - docker login code.icb4dc0.de -u prskr -p "$${GITEA_TOKEN}" + - go run github.com/magefile/mage -d build -w . release + depends_on: + - Lint + - Test + volumes: + - name: go-cache + path: /go + volumes: - name: go-cache temp: { } diff --git a/.gitignore b/.gitignore index f0a9847..1c82e50 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ *.test mock_*_test.go *.mock.go +go.work.sum # Output of the go coverage tool, specifically when used with LiteIDE *.out @@ -20,5 +21,6 @@ mock_*_test.go # Dependency directories (remove the comment below to include it) # vendor/ out/ +dist/ .idea/ \ No newline at end of file diff --git a/.goreleaser.yml b/.goreleaser.yml new file mode 100644 index 0000000..8387d53 --- /dev/null +++ b/.goreleaser.yml @@ -0,0 +1,63 @@ +project_name: nitter +gitea_urls: + api: https://code.icb4dc0.de/api/v1 + download: https://code.icb4dc0.de +builds: + - id: nitter + binary: nitter + main: . + flags: + - -trimpath + - -a + ldflags: + - -w -s + env: + - CGO_ENABLED=0 + goos: + - linux + - darwin + - windows + goarch: + - amd64 + - arm64 +archives: + - id: nitter + builds: + - nitter + name_template: "{{ .ProjectName }}_server_{{ .Version }}_{{ .Os }}_{{ .Arch }}" + wrap_in_directory: true + files: [ ] + +kos: + - id: nitter + build: nitter + base_image: docker.io/golangci/golangci-lint:latest + repository: code.icb4dc0.de/prskr + platforms: + - linux/amd64 + - linux/arm64 + tags: + - latest + - '{{.Tag}}' + sbom: none + bare: true + preserve_import_paths: false + base_import_paths: true + +checksum: + name_template: 'checksums.txt' + +snapshot: + name_template: "{{ .Tag }}-next" + +changelog: + sort: asc + filters: + exclude: + - '^docs:' + - '^test:' + +release: + gitea: + owner: prskr + name: nitter diff --git a/build/go.sum b/build/go.sum index 27ddc72..3e742e3 100644 --- a/build/go.sum +++ b/build/go.sum @@ -5,3 +5,4 @@ github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXq golang.org/x/exp v0.0.0-20230307190834-24139beb5833 h1:SChBja7BCQewoTAU7IgvucQKMIXrEpFxNMs0spT3/5s= golang.org/x/exp v0.0.0-20230307190834-24139beb5833/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= diff --git a/build/release.go b/build/release.go new file mode 100644 index 0000000..e707394 --- /dev/null +++ b/build/release.go @@ -0,0 +1,23 @@ +//go:build mage + +package main + +import ( + "context" + + "github.com/magefile/mage/mg" +) + +func Release(ctx context.Context) error { + mg.CtxDeps(ctx, Generate) + + if err := ensureGoTool("goreleaser", "github.com/goreleaser/goreleaser", "latest"); err != nil { + return err + } + + if IsReleaseBuild { + return GoReleaser("release", "--clean") + } + + return GoReleaser("release", "--snapshot", "--clean") +} diff --git a/build/tools.go b/build/tools.go index 784798b..42b8969 100644 --- a/build/tools.go +++ b/build/tools.go @@ -62,9 +62,11 @@ func ensureGoTool(toolName, importPath, version string) error { } func checkForTool(toolName string, fallbackAction func() error) error { - if _, err := exec.LookPath(toolName); err != nil { + if fullPath, err := exec.LookPath(toolName); err != nil { slog.Warn("tool is missing", slog.String("toolName", toolName)) return fallbackAction() + } else { + slog.Info("Found tool", slog.String("path", fullPath)) } return nil diff --git a/go.mod b/go.mod index 5c05c45..42ff922 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.5.0 // indirect @@ -37,6 +38,7 @@ require ( golang.org/x/sys v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 9855884..12d86ea 100644 --- a/go.sum +++ b/go.sum @@ -142,6 +142,7 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -159,13 +160,15 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= @@ -494,8 +497,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/go.work.sum b/go.work.sum deleted file mode 100644 index 969e122..0000000 --- a/go.work.sum +++ /dev/null @@ -1,13 +0,0 @@ -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= -go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/nitters/gitea/pr_nitter.go b/nitters/gitea/pr_nitter.go index 4fd5bdd..3ddb7b0 100644 --- a/nitters/gitea/pr_nitter.go +++ b/nitters/gitea/pr_nitter.go @@ -33,7 +33,6 @@ func init() { } func NewPRNitter(logger *slog.Logger, cli Client, cfg *GiteaPRConfig) *prNitter { - if logger == nil { logger = slog.Default() } -- 2.45.2