Skip to content

Commit 0f4b819

Browse files
committed
Fix CD pipeline
1 parent 790d7e1 commit 0f4b819

File tree

6 files changed

+30
-10
lines changed

6 files changed

+30
-10
lines changed

.github/workflows/tagpr.yml

+20-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: Run tagpr
2525
uses: Songmu/tagpr@v1
2626

27-
darwin-release:
27+
darwin-assets:
2828
needs: tagpr
2929
if: needs.tagpr.outputs.tagpr-tag != ''
3030
runs-on: macos-latest
@@ -43,14 +43,18 @@ jobs:
4343

4444
- name: Setup
4545
run: |
46-
brew install goreleaser
4746
brew install sqlite3
4847
49-
- name: Release
50-
run: |
51-
make release_darwin
48+
- name: Run GoReleaser
49+
uses: goreleaser/goreleaser-action@v5
50+
with:
51+
distribution: goreleaser
52+
version: latest
53+
args: --config .goreleaser/darwin.yml --clean
54+
env:
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5256

53-
linux-release:
57+
linux-assets:
5458
needs: tagpr
5559
if: needs.tagpr.outputs.tagpr-tag != ''
5660
runs-on: ubuntu-latest
@@ -101,7 +105,7 @@ jobs:
101105
env:
102106
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103107

104-
windows-release:
108+
windows-assets:
105109
needs: tagpr
106110
if: needs.tagpr.outputs.tagpr-tag != ''
107111
runs-on: windows-2019
@@ -196,3 +200,12 @@ jobs:
196200
org.opencontainers.image.revision=${{ github.sha }}
197201
org.opencontainers.image.version=${{ steps.latest_version.outputs.version }}
198202
org.opencontainers.image.source=https://github.com/k1LoW/tbls
203+
release:
204+
needs: [tagpr, darwin-assets, linux-assets, windows-assets, dockerimage]
205+
runs-on: ubuntu-latest
206+
steps:
207+
- name: Release
208+
run: |
209+
gh api /repos/${{ github.repository }}/releases/generate-notes -f tag_name=${{ needs.tagpr.outputs.tagpr-tag }} --jq .body | gh release edit ${{ needs.tagpr.outputs.tagpr-tag }} --repo ${{ github.repository }} --draft=false --latest --notes-file=-
210+
env:
211+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser/darwin.yml

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ changelog:
3737
exclude:
3838
- '^docs:'
3939
- '^test:'
40+
release:
41+
draft: true
42+
replace_existing_draft: true

.goreleaser/linux.yml

+3
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ nfpms:
6464
- apk
6565
bindir: /usr/bin
6666
epoch: 1
67+
release:
68+
draft: true
69+
replace_existing_draft: true

.goreleaser/windows.yml

+3
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ changelog:
4343
exclude:
4444
- '^docs:'
4545
- '^test:'
46+
release:
47+
draft: true
48+
replace_existing_draft: true

.tagpr

+1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
[tagpr]
3333
vPrefix = true
3434
releaseBranch = main
35+
release = draft
3536
versionFile = version/version.go
3637
command = "make prerelease_for_tagpr"

Makefile

-3
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,4 @@ prerelease_for_tagpr: depsdev
180180
gocredits -w .
181181
git add CHANGELOG.md CREDITS go.mod go.sum
182182

183-
release_darwin:
184-
goreleaser --config .goreleaser/darwin.yml --clean
185-
186183
.PHONY: default test

0 commit comments

Comments
 (0)