Skip to content

Commit b2e9d3b

Browse files
authored
chore/fix: switch release pipeline to goreleaser & ghcr.io (#43)
* chore: add goreleaser config + adapt Dockerfile * chore: cleanup makefile and deprecated pipeline * chore: go mod tidy -go=1.19 * feat: add release pipeline --------- Signed-off-by: Matthias Riegler <me@xvzf.tech>
1 parent 01f689f commit b2e9d3b

9 files changed

Lines changed: 106 additions & 120 deletions

File tree

.github/workflows/docker.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/go-release.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/go-releaser.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: goreleaser
2+
3+
on:
4+
push:
5+
tags:
6+
- "*"
7+
8+
permissions:
9+
contents: write
10+
packages: write
11+
12+
jobs:
13+
release:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Set up Go
17+
uses: actions/setup-go@v3
18+
with:
19+
go-version: 1.19
20+
21+
# Get values for cache paths to be used in later steps
22+
- id: go-cache-paths
23+
run: |
24+
echo "::set-output name=go-build::$(go env GOCACHE)"
25+
echo "::set-output name=go-mod::$(go env GOMODCACHE)"
26+
27+
- name: Checkout repository
28+
uses: actions/checkout@v2
29+
30+
# Cache go build cache, used to speedup go test
31+
- name: Go Build Cache
32+
uses: actions/cache@v2
33+
with:
34+
path: ${{ steps.go-cache-paths.outputs.go-build }}
35+
key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
36+
#
37+
# Cache go mod cache, used to speedup builds
38+
- name: Go Mod Cache
39+
uses: actions/cache@v2
40+
with:
41+
path: ${{ steps.go-cache-paths.outputs.go-mod }}
42+
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
43+
# Run goreleaser; this one creates the GH release and pushes the images
44+
- name: Run GoReleaser
45+
id: goreleaser-id
46+
uses: goreleaser/goreleaser-action@v2
47+
with:
48+
distribution: goreleaser
49+
version: latest
50+
args: release --rm-dist
51+
env:
52+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
dist
12
docsonnet

.goreleaser.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
project_name: docsonnet
2+
before:
3+
hooks:
4+
- go mod tidy
5+
builds:
6+
- binary: docsonnet
7+
env:
8+
- CGO_ENABLED=0
9+
goos:
10+
- linux
11+
- darwin
12+
goarch:
13+
- amd64
14+
- arm64
15+
checksum:
16+
name_template: 'checksums.txt'
17+
dockers:
18+
- image_templates:
19+
- "ghcr.io/jsonnet-libs/docsonnet:{{ .Version }}-amd64"
20+
use: buildx
21+
dockerfile: Dockerfile
22+
build_flag_templates:
23+
- "--platform=linux/amd64"
24+
- image_templates:
25+
- "ghcr.io/jsonnet-libs/docsonnet:{{ .Version }}-arm64v8"
26+
use: buildx
27+
goarch: arm64
28+
dockerfile: Dockerfile
29+
build_flag_templates:
30+
- "--platform=linux/arm64/v8"
31+
docker_manifests:
32+
- name_template: ghcr.io/jsonnet-libs/docsonnet:{{ .Version }}
33+
image_templates:
34+
- ghcr.io/jsonnet-libs/docsonnet:{{ .Version }}-amd64
35+
- ghcr.io/jsonnet-libs/docsonnet:{{ .Version }}-arm64v8

Dockerfile

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.16.4 as base
2-
3-
ENV GO111MODULE=on
4-
WORKDIR /app
5-
6-
COPY go.mod .
7-
COPY go.sum .
8-
9-
RUN go mod download
10-
11-
COPY . .
12-
13-
FROM base AS builder
14-
15-
ENV GOARCH=$TARGETARCH
16-
RUN CGO_ENABLED=0 go build -ldflags='-s -w -extldflags "-static"' .
17-
181
FROM alpine:3.12
19-
COPY --from=builder /app/docsonnet /usr/local/bin
20-
21-
ENTRYPOINT ["docsonnet"]
2+
ENTRYPOINT ["/usr/bin/docsonnet"]
3+
COPY docsonnet /usr/bin/docsonnet

Makefile

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
.PHONY: build test push push-image docs
2-
3-
IMAGE_NAME ?= docsonnet
4-
IMAGE_PREFIX ?= jsonnetlibs
5-
IMAGE_TAG ?= 0.0.4
1+
.PHONY: build release docs
62

73
build:
8-
docker buildx build -t $(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG) .
9-
10-
test: build
11-
12-
push: build test push-image
4+
goreleaser build --rm-dist --snapshot
135

14-
push-image:
15-
docker push $(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)
16-
docker push $(IMAGE_PREFIX)/$(IMAGE_NAME):latest
6+
release:
7+
goreleaser release --rm-dist
178

189
docs:
1910
jsonnet -S -c -m doc-util/ \

go.mod

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/jsonnet-libs/docsonnet
22

3-
go 1.16
3+
go 1.19
44

55
require (
66
github.com/go-clix/cli v0.1.2-0.20200502172020-b8f4629e879a
@@ -10,3 +10,14 @@ require (
1010
github.com/stretchr/testify v1.4.0
1111
gopkg.in/yaml.v2 v2.2.7
1212
)
13+
14+
require (
15+
github.com/davecgh/go-spew v1.1.1 // indirect
16+
github.com/gobuffalo/here v0.6.0 // indirect
17+
github.com/hashicorp/errwrap v1.0.0 // indirect
18+
github.com/hashicorp/go-multierror v1.0.0 // indirect
19+
github.com/pmezard/go-difflib v1.0.0 // indirect
20+
github.com/posener/complete v1.2.3 // indirect
21+
github.com/spf13/pflag v1.0.5 // indirect
22+
sigs.k8s.io/yaml v1.1.0 // indirect
23+
)

go.sum

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
54
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
65
github.com/go-clix/cli v0.1.2-0.20200502172020-b8f4629e879a h1:nh+UOawbjKgiUAJAgi8JHctNebEu6mjwDXsv8Xdln8w=
76
github.com/go-clix/cli v0.1.2-0.20200502172020-b8f4629e879a/go.mod h1:dYJevXraB9mXZFhz5clyQestG0qGcmT5rRC/P9etoRQ=
87
github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
98
github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
109
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
1110
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
12-
github.com/google/go-jsonnet v0.15.1-0.20200415122941-8a0084e64395 h1:PftVLaNFPyiHId46033ADWFgXAWIwSDK9ESNRIKdj1Q=
13-
github.com/google/go-jsonnet v0.15.1-0.20200415122941-8a0084e64395/go.mod h1:sOcuej3UW1vpPTZOr8L7RQimqai1a57bt5j22LzGZCw=
1411
github.com/google/go-jsonnet v0.18.0 h1:/6pTy6g+Jh1a1I2UMoAODkqELFiVIdOxbNwv0DDzoOg=
1512
github.com/google/go-jsonnet v0.18.0/go.mod h1:C3fTzyVJDslXdiTqw/bTFk7vSGyCtH3MGRbDfvEwGd0=
1613
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
@@ -24,10 +21,7 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
2421
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
2522
github.com/markbates/pkger v0.15.1 h1:3MPelV53RnGSW07izx5xGxl4e/sdRD6zqseIk0rMASY=
2623
github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
27-
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
2824
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
29-
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
30-
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
3125
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
3226
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3327
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -40,8 +34,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
4034
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
4135
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
4236
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
43-
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
44-
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4537
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4638
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4739
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=

0 commit comments

Comments
 (0)