Skip to content

Commit 7b3a4bb

Browse files
authored
Merge pull request #471 from cego/bump-and-fixes
Bump and fixes
2 parents 7f12073 + e0e32b2 commit 7b3a4bb

20 files changed

Lines changed: 4487 additions & 2698 deletions

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ updates:
33
- package-ecosystem: "gomod"
44
directory: "/"
55
schedule:
6-
interval: "daily"
6+
interval: "weekly"
77
- package-ecosystem: "npm"
88
directory: "/webapp/"
99
schedule:
10-
interval: "daily"
10+
interval: "weekly"

.github/workflows/gofmt.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616

17-
- name: Set up Go 1.20
18-
uses: actions/setup-go@v1
17+
- name: Set up Go 1.21
18+
uses: actions/setup-go@v4
1919
with:
20-
go-version: 1.20
20+
go-version: 1.21
2121
id: go
2222

2323
- name: Check out code into the Go module directory
24-
uses: actions/checkout@v1
24+
uses: actions/checkout@v4
2525

26-
- uses: actions/cache@v1
26+
- uses: actions/cache@v3
2727
with:
2828
path: ~/go/pkg/mod
29-
key: ${{ runner.os }}-gofmt1.20-${{ hashFiles('**/go.sum') }}
29+
key: ${{ runner.os }}-gofmt1.21-${{ hashFiles('**/go.sum') }}
3030
restore-keys: |
31-
${{ runner.os }}-gofmt1.20-
31+
${{ runner.os }}-gofmt1.21-
3232
3333
- name: gofmt
3434
run: |

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
name: Build Linux All
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: Set up Go 1.20
14-
uses: actions/setup-go@v1
13+
- name: Set up Go 1.21
14+
uses: actions/setup-go@v4
1515
with:
16-
go-version: 1.20
16+
go-version: 1.21
1717

1818
- name: Checkout code
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020

2121
- name: Build
2222
run: |
@@ -25,7 +25,7 @@ jobs:
2525
mv build/*.tar.gz release
2626
2727
- name: Upload artifacts
28-
uses: actions/upload-artifact@v2
28+
uses: actions/upload-artifact@v3
2929
with:
3030
name: linux-latest
3131
path: release

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020

21-
- name: Set up Go 1.20
22-
uses: actions/setup-go@v1
21+
- name: Set up Go 1.21
22+
uses: actions/setup-go@v4
2323
with:
24-
go-version: 1.20
24+
go-version: 1.21
2525
id: go
2626

2727
- name: Check out code into the Go module directory
28-
uses: actions/checkout@v1
28+
uses: actions/checkout@v4
2929

30-
- uses: actions/cache@v1
30+
- uses: actions/cache@v3
3131
with:
3232
path: ~/go/pkg/mod
33-
key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }}
33+
key: ${{ runner.os }}-go1.21-${{ hashFiles('**/go.sum') }}
3434
restore-keys: |
35-
${{ runner.os }}-go1.20-
35+
${{ runner.os }}-go1.21-
3636
3737
- name: Build
3838
run: make all -B

go.mod

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/slyngdk/nebula-provisioner
22

3-
go 1.20
3+
go 1.21
44

55
require (
6-
github.com/99designs/gqlgen v0.17.34
6+
github.com/99designs/gqlgen v0.17.39
77
github.com/dgraph-io/badger/v3 v3.2103.5
88
github.com/golang/protobuf v1.5.3
99
github.com/gorilla/mux v1.8.0
@@ -17,11 +17,11 @@ require (
1717
github.com/sirupsen/logrus v1.9.3
1818
github.com/slackhq/nebula v1.7.2
1919
github.com/spf13/cobra v1.7.0
20-
github.com/vektah/gqlparser/v2 v2.5.6
21-
golang.org/x/crypto v0.11.0
22-
golang.org/x/oauth2 v0.10.0
23-
golang.org/x/tools v0.11.0
24-
google.golang.org/grpc v1.56.2
20+
github.com/vektah/gqlparser/v2 v2.5.10
21+
golang.org/x/crypto v0.14.0
22+
golang.org/x/oauth2 v0.13.0
23+
golang.org/x/tools v0.14.0
24+
google.golang.org/grpc v1.58.2
2525
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
2626
google.golang.org/protobuf v1.31.0
2727
gopkg.in/yaml.v3 v3.0.1
@@ -39,6 +39,7 @@ require (
3939
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4040
github.com/golang/snappy v0.0.4 // indirect
4141
github.com/google/flatbuffers v23.5.26+incompatible // indirect
42+
github.com/google/uuid v1.3.1 // indirect
4243
github.com/gorilla/securecookie v1.1.1 // indirect
4344
github.com/gorilla/websocket v1.5.0 // indirect
4445
github.com/hashicorp/golang-lru/v2 v2.0.4 // indirect
@@ -47,17 +48,18 @@ require (
4748
github.com/klauspost/compress v1.16.7 // indirect
4849
github.com/mitchellh/mapstructure v1.5.0 // indirect
4950
github.com/russross/blackfriday/v2 v2.1.0 // indirect
51+
github.com/sosodev/duration v1.1.0 // indirect
5052
github.com/spf13/pflag v1.0.5 // indirect
5153
github.com/urfave/cli/v2 v2.25.7 // indirect
5254
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
5355
go.opencensus.io v0.24.0 // indirect
54-
golang.org/x/mod v0.12.0 // indirect
55-
golang.org/x/net v0.12.0 // indirect
56-
golang.org/x/sys v0.10.0 // indirect
57-
golang.org/x/term v0.10.0 // indirect
58-
golang.org/x/text v0.11.0 // indirect
56+
golang.org/x/mod v0.13.0 // indirect
57+
golang.org/x/net v0.16.0 // indirect
58+
golang.org/x/sys v0.13.0 // indirect
59+
golang.org/x/term v0.13.0 // indirect
60+
golang.org/x/text v0.13.0 // indirect
5961
google.golang.org/appengine v1.6.7 // indirect
60-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230710151506-e685fd7b542b // indirect
62+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
6163
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
6264
gopkg.in/yaml.v2 v2.4.0 // indirect
6365
)

0 commit comments

Comments
 (0)