Skip to content

Commit ae496be

Browse files
committed
Update release workflow and go generate
1 parent 71fe08d commit ae496be

File tree

7 files changed

+20
-13
lines changed

7 files changed

+20
-13
lines changed

.github/workflows/release.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ jobs:
2323
registry: ghcr.io
2424
username: ${{ github.repository_owner }}
2525
password: ${{ secrets.GITHUB_TOKEN }}
26-
- name: Install rice
27-
run: |
28-
go install github.com/GeertJohan/go.rice/rice
2926
- name: Run GoReleaser
3027
uses: goreleaser/goreleaser-action@v3
3128
with:

.gitpod.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ FROM gitpod/workspace-full
33
ENV rebuild=0
44

55
USER root
6-
RUN curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/bin v1.39.0
6+
RUN curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/bin v1.48.0

.gitpod.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ ports:
1313
tasks:
1414
- init: |
1515
git config core.hooksPath .githooks;
16-
go get -v ./... && go generate -v ./...
16+
go mod download
17+
go generate -v ./...
1718
vscode:
1819
extensions:
1920
- golang.go

.goreleaser.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
# This is an example goreleaser.yaml file with some sane defaults.
2-
# Make sure to check the documentation at http://goreleaser.com
31
before:
42
hooks:
5-
# you may remove this if you don't use vgo
6-
- go mod tidy
7-
# you may remove this if you don't need go generate
3+
- go install github.com/GeertJohan/go.rice/rice
4+
- go mod download
85
- go generate ./...
96
builds:
107
- env:
@@ -13,7 +10,7 @@ builds:
1310
- -s -w -X github.com/gitpod-io/leeway/pkg/leeway.Version={{.Version}}-{{.ShortCommit}}
1411
ignore:
1512
- goos: darwin
16-
13+
1714
archives:
1815
- replacements:
1916
darwin: Darwin
@@ -29,4 +26,4 @@ changelog:
2926
filters:
3027
exclude:
3128
- '^docs:'
32-
- '^test:'
29+
- '^test:'

go.mod

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ require (
2828
)
2929

3030
require (
31+
github.com/GeertJohan/go.incremental v1.0.0 // indirect
3132
github.com/Microsoft/go-winio v0.4.16 // indirect
3233
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
3334
github.com/acomagu/bufpipe v1.0.3 // indirect
35+
github.com/akavel/rsrc v0.8.0 // indirect
3436
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
3537
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
3638
github.com/emirpasic/gods v1.12.0 // indirect
@@ -41,18 +43,22 @@ require (
4143
github.com/godbus/dbus/v5 v5.0.6 // indirect
4244
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4345
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
46+
github.com/jessevdk/go-flags v1.5.0 // indirect
4447
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
4548
github.com/mattn/go-colorable v0.1.8 // indirect
4649
github.com/mattn/go-isatty v0.0.12 // indirect
4750
github.com/mitchellh/go-homedir v1.1.0 // indirect
4851
github.com/moby/sys/mountinfo v0.5.0 // indirect
52+
github.com/nkovacs/streamquote v1.0.0 // indirect
4953
github.com/owenrumney/go-sarif v1.0.11 // indirect
5054
github.com/pkg/errors v0.9.1 // indirect
5155
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
5256
github.com/segmentio/fasthash v1.0.3 // indirect
5357
github.com/sergi/go-diff v1.2.0 // indirect
5458
github.com/shibumi/go-pathspec v1.2.0 // indirect
5559
github.com/spf13/pflag v1.0.5 // indirect
60+
github.com/valyala/bytebufferpool v1.0.0 // indirect
61+
github.com/valyala/fasttemplate v1.0.1 // indirect
5662
github.com/xanzy/ssh-agent v0.3.0 // indirect
5763
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
5864
github.com/zclconf/go-cty v1.8.4 // indirect

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
4040
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
4141
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4242
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
43+
github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg=
4344
github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
4445
github.com/GeertJohan/go.rice v1.0.2 h1:PtRw+Tg3oa3HYwiDBZyvOJ8LdIyf6lAovJJtr7YOAYk=
4546
github.com/GeertJohan/go.rice v1.0.2/go.mod h1:af5vUNlDNkCjOZeSGFgIJxDje9qdjsO6hshx0gTmZt4=
@@ -50,6 +51,7 @@ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C6
5051
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
5152
github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
5253
github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
54+
github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
5355
github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
5456
github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
5557
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
@@ -238,6 +240,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
238240
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
239241
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
240242
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
243+
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
241244
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
242245
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
243246
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
@@ -296,6 +299,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
296299
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
297300
github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
298301
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
302+
github.com/nkovacs/streamquote v1.0.0 h1:PmVIV08Zlx2lZK5fFZlMZ04eHcDTIFJCv/5/0twVUow=
299303
github.com/nkovacs/streamquote v1.0.0/go.mod h1:BN+NaZ2CmdKqUuTUXUEm9j95B2TRbpOWpxbJYzzgUsc=
300304
github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
301305
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -371,7 +375,9 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG
371375
github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
372376
github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
373377
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
378+
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
374379
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
380+
github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
375381
github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
376382
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
377383
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=

pkg/graphview/graphview.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//go:generate bash -c "cd web && yarn install && yarn build"
2-
//go:generate bash -c "go get github.com/GeertJohan/go.rice/rice && rice embed-go"
2+
//go:generate bash -c "go install github.com/GeertJohan/go.rice/rice && rice embed-go"
33

44
package graphview
55

0 commit comments

Comments
 (0)