Skip to content

Commit ca6ba6c

Browse files
committed
ci: fixed release jobs
1 parent 8516b96 commit ca6ba6c

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

.github/prerelease.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ function cleanup {
2121
}
2222
trap cleanup EXIT
2323

24+
# Create some directories to avoid race errors on snap packages build
25+
mkdir -p ${HOME}/.cache/snapcraft/{download,stage-packages}
26+
2427
# Build the binaries using a prerelease tag
2528
git tag -d edge
2629
git tag -f ${PRERELEASE_TAG}
2730
goreleaser release \
28-
--rm-dist \
29-
--skip-validate \
31+
--clean \
32+
--skip=validate \
3033
-f .goreleaser.pre.yml
3134

3235
# Delete existing assets from the edge prerelease on GitHub

.github/workflows/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ jobs:
4949
password: ${{ secrets.QUAY_TOKEN }}
5050

5151
- name: Snapcraft config
52-
uses: samuelmeuli/action-snapcraft@v1
53-
with:
54-
snapcraft_token: ${{ secrets.SNAPCRAFT_TOKEN }}
52+
uses: samuelmeuli/action-snapcraft@v2
5553

5654
- name: Set up Go
5755
uses: actions/setup-go@v4
@@ -74,3 +72,4 @@ jobs:
7472
run: make ${{ github.ref == 'refs/heads/main' && 'pre' || '' }}release
7573
env:
7674
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
75+
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}

.goreleaser.pre.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ universal_binaries:
2525

2626
archives:
2727
- name_template: '{{ .ProjectName }}_edge_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
28-
rlcp: true
2928
format_overrides:
3029
- goos: windows
3130
format: zip
@@ -191,4 +190,4 @@ checksum:
191190
algorithm: sha512
192191

193192
changelog:
194-
skip: true
193+
disable: true

.goreleaser.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ universal_binaries:
2525

2626
archives:
2727
- name_template: '{{ .ProjectName }}_{{ .Tag }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
28-
rlcp: true
2928
format_overrides:
3029
- goos: windows
3130
format: zip
@@ -69,7 +68,7 @@ brews:
6968
homepage: *homepage
7069
license: *license
7170
folder: Formula
72-
tap:
71+
repository:
7372
owner: mvisonneau
7473
name: homebrew-tap
7574
test: |
@@ -84,7 +83,7 @@ scoops:
8483
- description: *description
8584
homepage: *homepage
8685
license: *license
87-
bucket:
86+
repository:
8887
owner: mvisonneau
8988
name: scoops
9089

@@ -211,4 +210,4 @@ signs:
211210
]
212211

213212
changelog:
214-
skip: true
213+
disable: true

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ build: ## Build the binaries using local GOOS
3333

3434
.PHONY: release
3535
release: ## Build & release the binaries (stable)
36+
mkdir -p ${HOME}/.cache/snapcraft/{download,stage-packages}
3637
git tag -d edge
3738
goreleaser release --clean
3839
find dist -type f -name "*.snap" -exec snapcraft upload --release stable,edge '{}' \;

0 commit comments

Comments
 (0)