From 7d18be9d7739f1db98fc075eaa756f55a763bdf0 Mon Sep 17 00:00:00 2001 From: Th0masL Date: Mon, 2 Jan 2023 13:50:53 +0200 Subject: [PATCH] Use Env Vars to build and push Docker Images, bump golangci-lint to v1.50.1 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 10 +++++++++- .goreleaser.yml | 10 +++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c3f5d5..1b52200 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v3 - uses: golangci/golangci-lint-action@v3 with: - version: v1.43.0 + version: v1.50.1 - name: Go mod env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23a9307..cb85402 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,6 +31,10 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Prepare Env Vars + run: | + echo GHCR_USER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV + # Publish a new release from git tag. - uses: goreleaser/goreleaser-action@v3.2.0 if: startsWith(github.ref, 'refs/tags/') @@ -38,13 +42,17 @@ jobs: version: latest args: release --rm-dist env: + DOCKERHUB_USER: ${{ secrets.DOCKER_LOGIN }} + GHCR_USER: ${{ env.GHCR_USER }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Publish nightly build. - uses: goreleaser/goreleaser-action@v3.2.0 - if: github.event_name == 'schedule' + if: ${{ github.repository_owner == 'mxpv' && github.event_name == 'schedule' }} with: version: latest args: release --rm-dist --nightly env: + DOCKERHUB_USER: ${{ secrets.DOCKER_LOGIN }} + GHCR_USER: ${{ env.GHCR_USER }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yml b/.goreleaser.yml index 93a8b0e..5d2a140 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -21,11 +21,11 @@ builds: dockers: - image_templates: - - 'mxpv/podsync:{{ .Tag }}' - - 'mxpv/podsync:v{{ .Major }}.{{ .Minor }}' - - 'mxpv/podsync:latest' - - 'ghcr.io/mxpv/podsync:{{ .Tag }}' - - 'ghcr.io/mxpv/podsync:latest' + - "{{ .Env.DOCKERHUB_USER }}/podsync:{{ .Tag }}" + - "{{ .Env.DOCKERHUB_USER }}/podsync:v{{ .Major }}.{{ .Minor }}" + - "{{ .Env.DOCKERHUB_USER }}/podsync:latest" + - "ghcr.io/{{ .Env.GHCR_USER }}/podsync:{{ .Tag }}" + - "ghcr.io/{{ .Env.GHCR_USER }}/podsync:latest" archives: - replacements: