Skip to content

Commit d144442

Browse files
authored
Merge pull request #304 from rest-sh/cfunkhouser/goreleaser-v6
ci: Fix CI and Release
2 parents e68f7d3 + ae815fb commit d144442

File tree

4 files changed

+86
-34
lines changed

4 files changed

+86
-34
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: CI
2+
23
on:
34
push:
45
branches: [main]
@@ -15,11 +16,12 @@ jobs:
1516
os: [ubuntu-latest, windows-latest]
1617

1718
steps:
18-
- uses: actions/checkout@v2
19+
- name: Checkout
20+
uses: actions/checkout@v5
1921
- name: Set up go
20-
uses: actions/setup-go@v1
22+
uses: actions/setup-go@v6
2123
with:
22-
go-version: "1.24"
24+
go-version: 1.24
2325
- run: go test -coverprofile=coverage.txt -covermode=atomic ./...
2426
if: matrix.os == 'ubuntu-latest'
2527
- run: go test

.github/workflows/release.yaml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,24 @@ on:
99
jobs:
1010
goreleaser:
1111
runs-on: ubuntu-latest
12+
1213
steps:
13-
- name: Checkout
14-
uses: actions/checkout@v2
15-
with:
16-
fetch-depth: 0
17-
- name: Set up Go
18-
uses: actions/setup-go@v2
19-
with:
20-
go-version: 1.24
21-
- name: Run GoReleaser
22-
uses: goreleaser/goreleaser-action@v2
14+
- name: Checkout repository
15+
uses: actions/checkout@v5
16+
17+
- name: Generate App Token for GoReleaser
18+
id: releaser-token
19+
uses: actions/create-github-app-token@v2
2320
with:
24-
version: latest
25-
args: release --clean
26-
env:
27-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
21+
app-id: ${{ secrets.RELEASER_APP_ID }}
22+
private-key: ${{ secrets.RELEASER_APP_PRIVATE_KEY }}
23+
24+
- name: Build using goreleaser-cross
25+
run: |
26+
docker run --rm \
27+
-e CGO_ENABLED=1 \
28+
-e GITHUB_TOKEN=${{ steps.releaser-token.outputs.token }} \
29+
-v $PWD:/workspace \
30+
-w /workspace \
31+
ghcr.io/goreleaser/goreleaser-cross:v1.25-v2.12.7 \
32+
release --clean --verbose

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
dist
22
TODO*
33
launch.json
4-

.goreleaser.yml

Lines changed: 62 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,79 @@
1-
# This is an example goreleaser.yaml file with some sane defaults.
2-
# Make sure to check the documentation at http://goreleaser.com
1+
version: 2
2+
3+
project_name: restish
4+
35
before:
46
hooks:
57
- go mod download
8+
# TODO: Figure out how to test with CGO on all platforms.
9+
- go test -v ./...
10+
611
builds:
7-
- env:
8-
- CGO_ENABLED=0
12+
- id: restish-darwin-amd64
13+
goos:
14+
- darwin
15+
goarch:
16+
- amd64
17+
env:
18+
- CGO_ENABLED=1
19+
- CC=o64-clang
20+
- CXX=o64-clang++
21+
22+
- id: restish-darwin-arm64
923
goos:
10-
- linux
1124
- darwin
25+
goarch:
26+
- arm64
27+
env:
28+
- CGO_ENABLED=1
29+
- CC=oa64-clang
30+
- CXX=oa64-clang++
31+
32+
- id: restish-linux-amd64
33+
goos:
34+
- linux
35+
goarch:
36+
- amd64
37+
env:
38+
- CGO_ENABLED=1
39+
- CC=x86_64-linux-gnu-gcc
40+
- CXX=x86_64-linux-gnu-g++
41+
42+
- id: restish-linux-arm64
43+
goos:
44+
- linux
45+
goarch:
46+
- arm64
47+
env:
48+
- CGO_ENABLED=1
49+
- CC=aarch64-linux-gnu-gcc
50+
- CXX=aarch64-linux-gnu-g++
51+
52+
- id: restish-windows-amd64
53+
goos:
1254
- windows
13-
ignore:
14-
- goos: darwin
15-
goarch: "386"
55+
goarch:
56+
- amd64
57+
env:
58+
- CGO_ENABLED=1
59+
- CC=x86_64-w64-mingw32-gcc
60+
- CXX=x86_64-w64-mingw32-g++
61+
1662
archives:
1763
- name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
1864
format_overrides:
1965
- goos: windows
20-
format: zip
21-
brews:
22-
- repository:
23-
owner: danielgtaylor
24-
name: homebrew-restish
25-
homepage: https://rest.sh/
26-
description: Restish is a CLI for interacting with REST-ish HTTP APIs with some nice features built-in.
66+
formats:
67+
- zip
68+
69+
# TODO(#306): Return homebrew publication.
70+
2771
checksum:
2872
name_template: "checksums.txt"
73+
2974
snapshot:
30-
name_template: "{{ .Tag }}-next"
75+
version_template: "{{ .Tag }}-next"
76+
3177
changelog:
3278
sort: asc
3379
filters:

0 commit comments

Comments
 (0)