diff --git a/.github/workflows/realease.yaml b/.github/workflows/release.yaml similarity index 98% rename from .github/workflows/realease.yaml rename to .github/workflows/release.yaml index ec01dd0b..a74d18ab 100644 --- a/.github/workflows/realease.yaml +++ b/.github/workflows/release.yaml @@ -9,24 +9,6 @@ on: required: true jobs: - tag: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.sha }} - fetch-depth: '0' - - - name: Print Input - run: echo "${{ inputs.tag }}" - - - name: Bump version and push tag - uses: anothrNick/github-tag-action@1.55.0 - env: - GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} - WITH_V: true - CUSTOM_TAG: "v${{ inputs.tag }}" - goreleaser: needs: tag runs-on: ubuntu-latest @@ -55,7 +37,25 @@ jobs: uses: goreleaser/goreleaser-action@v4 with: distribution: goreleaser - version: latest + version: v1.19.2 args: release --clean env: GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} + + tag: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.sha }} + fetch-depth: '0' + + - name: Print Input + run: echo "${{ inputs.tag }}" + + - name: Bump version and push tag + uses: anothrNick/github-tag-action@1.55.0 + env: + GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} + WITH_V: true + CUSTOM_TAG: "v${{ inputs.tag }}" diff --git a/.goreleaser.yml b/.goreleaser.yml index 436f4611..acb390ca 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -41,8 +41,7 @@ builds: goarm: 7 dockers: - - use: buildx - goos: linux + - goos: linux goarch: amd64 dockerfile: goreleaser.dockerfile image_templates: @@ -53,12 +52,14 @@ dockers: - app/conf/goaws.yaml archives: - - replacements: - darwin: Darwin - linux: Linux - windows: Windows - 386: i386 - amd64: x86_64 + - id: archive_names + name_template: >- + {{- .ProjectName }}_ + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end -}} checksum: name_template: 'checksums.txt' snapshot: