From 3139e11fb92a1fbc5b0972245f07a6a216e035d2 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Mon, 4 Dec 2023 16:59:10 +0100 Subject: [PATCH] chore: cleanup, add docs, refactor some quirks and prepare release --- .forgejo/workflows/go.yaml | 19 +++++++++++++++++-- .forgejo/workflows/renovate.yaml | 3 --- .goreleaser.yaml | 7 ++++++- internal/retry/retry.go | 7 ++++++- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/go.yaml b/.forgejo/workflows/go.yaml index 8d87c95..62566fe 100644 --- a/.forgejo/workflows/go.yaml +++ b/.forgejo/workflows/go.yaml @@ -3,6 +3,8 @@ on: push: branches: - main + tags: + - "*" pull_request: branches: - main @@ -34,16 +36,29 @@ jobs: go install gotest.tools/gotestsum@latest gotestsum --junitfile out/results.xml --format pkgname-and-test-fails -- -race -shuffle=on ./... - - uses: goreleaser/goreleaser-action@v5 + - name: Snapshot release + uses: goreleaser/goreleaser-action@v5 if: ${{ !startsWith(github.ref, 'refs/tags/v') }} with: distribution: goreleaser version: latest args: release --clean --snapshot - - uses: goreleaser/goreleaser-action@v5 + - name: Login to Docker registry + if: ${{ startsWith(github.ref, 'refs/tags/v') }} + uses: docker/login-action@v3 + with: + registry: code.icb4dc0.de + username: ${{ github.repository_owner }} + password: ${{ secrets.RELEASE_TOKEN }} + + - name: Release + uses: goreleaser/goreleaser-action@v5 if: ${{ startsWith(github.ref, 'refs/tags/v') }} with: distribution: goreleaser version: latest args: release --clean + env: + GITHUB_TOKEN: "" + GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }} diff --git a/.forgejo/workflows/renovate.yaml b/.forgejo/workflows/renovate.yaml index 170af47..271cfc3 100644 --- a/.forgejo/workflows/renovate.yaml +++ b/.forgejo/workflows/renovate.yaml @@ -1,8 +1,5 @@ name: Renovate on: - push: - branches: - - main schedule: - cron: '33 3 * * *' diff --git a/.goreleaser.yaml b/.goreleaser.yaml index fb0015a..6684480 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -23,10 +23,11 @@ changelog: - '^docs:' - '^test:' +force_token: gitea release: gitea: owner: prskr - repo: nurse + name: nurse ids: - nurse mode: replace @@ -42,3 +43,7 @@ dockers: - code.icb4dc0.de/prskr/nurse:{{ .Major }} - code.icb4dc0.de/prskr/nurse:{{ .ShortCommit}} dockerfile: deployments/Dockerfile + +gitea_urls: + api: https://code.icb4dc0.de/api/v1 + download: https://code.icb4dc0.de diff --git a/internal/retry/retry.go b/internal/retry/retry.go index 52d9379..d26a4bf 100644 --- a/internal/retry/retry.go +++ b/internal/retry/retry.go @@ -10,7 +10,12 @@ import ( // It returns the last error encountered during the attempts. // If the context is canceled, it returns the context error (if there is no previous error), // or the joined error of the last error and the context error (otherwise). -func Retry(ctx context.Context, numberOfAttempts uint, attemptTimeout time.Duration, f func(ctx context.Context, attempt int) error) (lastErr error) { +func Retry( + ctx context.Context, + numberOfAttempts uint, + attemptTimeout time.Duration, + f func(ctx context.Context, attempt int) error, +) (lastErr error) { baseCtx, baseCancel := context.WithTimeout(ctx, time.Duration(numberOfAttempts)*attemptTimeout) defer baseCancel()