Skip to content

Commit 0bcb9ba

Browse files
committed
all: Update all dependencies.
1 parent 1310f3b commit 0bcb9ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1424
-2309
lines changed

.dockerignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
vendor
1+
.idea/
2+
vendor/

.github/workflows/build-and-release.yml

+9-14
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
name: Tests
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- name: Set up Go
26-
uses: actions/setup-go@v4
26+
uses: actions/setup-go@v5
2727
with:
28-
go-version: '1.19'
28+
go-version: '1.21'
2929

3030
- name: Dependencies
3131
run: go mod download
@@ -46,26 +46,21 @@ jobs:
4646
needs:
4747
- tests
4848
steps:
49-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
5050

5151
- name: Set up Go
52-
uses: actions/setup-go@v4
52+
uses: actions/setup-go@v5
5353
with:
54-
go-version: '1.19'
54+
go-version: '1.21'
5555

5656
- name: Dependencies
5757
run: go mod download
5858

5959
- name: Download UI
6060
run: go run cmd/download_ui/download_ui.go
6161

62-
- name: Run Packr
63-
run: |
64-
go run github.com/gobuffalo/packr/v2/packr2
65-
git checkout -- ./packrd/dummy.go
66-
6762
- name: Release
68-
uses: goreleaser/goreleaser-action@v4
63+
uses: goreleaser/goreleaser-action@v6
6964
if: startsWith(github.ref, 'refs/tags/v')
7065
with:
7166
version: latest
@@ -81,14 +76,14 @@ jobs:
8176
- tests
8277

8378
steps:
84-
- uses: actions/checkout@v3
79+
- uses: actions/checkout@v4
8580

8681
- name: Docker build
8782
run: |
8883
docker build -t $DOCKER_IMAGE_NAME:dev --build-arg VERSION=${{ github.ref_name }} .
8984
9085
- name: Log in to the Container registry
91-
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
86+
uses: docker/login-action@v3
9287
if: startsWith(github.ref, 'refs/tags/') || (github.ref == 'refs/heads/master')
9388
with:
9489
registry: ghcr.io

.gitignore

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
.idea/
2+
db/
3+
dist/
4+
vendor/
5+
16
*.swp
27
main
38
*.test
@@ -8,10 +13,6 @@ cayley.json
813
.cayley_history
914
.DS_Store
1015

11-
db/
12-
dist/
13-
vendor/
14-
ui/
1516
packrd/packed-*
1617
# The build binary
1718
/cayley

.goreleaser.yml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ builds:
99
- windows
1010
goarch:
1111
- amd64
12-
- "386"
1312
- arm64
1413
- arm
1514
ignore:

AUTHORS

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Alexander Peters <[email protected]>
1212
Andrew Dunham <[email protected]>
1313
Bram Leenders <[email protected]>
1414
Brendan Ball <[email protected]>
15-
Denys Smirnov <[email protected]>
15+
Denys Smirnov <[email protected]>
1616
Derek Liang <[email protected]>
1717
Iddan Aaronsohn <[email protected]>
1818
Google Inc.

CONTRIBUTORS

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Barak Michener <[email protected]> <[email protected]> <[email protected]>
1313
Bram Leenders <[email protected]>
1414
Brendan Ball <[email protected]>
1515
Connor Newton <[email protected]>
16-
Denys Smirnov <[email protected]>
16+
Denys Smirnov <[email protected]>
1717
Derek Liang <[email protected]>
1818
Gaurav Tiwari <[email protected]>
1919
Iddan Aaronsohn <[email protected]>

Dockerfile

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
FROM golang:1.19 as builder
1+
FROM golang:1.21 as builder
22

33
ARG VERSION=v0.8.x-dev
44

5-
# Install packr
6-
RUN go install github.com/gobuffalo/packr/v2/packr2@latest
7-
85
# Create filesystem for minimal image
96
WORKDIR /fs
107

@@ -21,16 +18,9 @@ WORKDIR /src
2118
COPY go.mod go.sum ./
2219
RUN go mod download
2320

24-
# Copy UI download script and execute
25-
COPY cmd/download_ui/ ./cmd/download_ui/
26-
RUN go run cmd/download_ui/download_ui.go
27-
2821
# Add all the other files
2922
ADD . .
3023

31-
# Run packr to generate .go files that pack the static files into bytes that can be bundled into the Go binary.
32-
RUN packr2
33-
3424
# Pass a Git short SHA as build information to be used for displaying version
3525
RUN GIT_SHA=$(git rev-parse --short=12 HEAD); \
3626
go build \

cmd/download_ui/download_ui.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const (
1515
version = "v0.8.0"
1616
fileURL = "https://github.com/cayleygraph/web/releases/download/" + version + "/web.zip"
1717
fileName = "web.zip"
18-
directoryName = "ui"
18+
directoryName = "ui/web"
1919
)
2020

2121
func main() {

docs/contributing.md

+3-33
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ Join our community on [discourse.cayley.io](https://discourse.cayley.io) or othe
66

77
## Simply building Cayley
88

9-
If your version of Go &lt; 1.13, you need to run:
10-
11-
```text
12-
export GO111MODULE=on
13-
```
14-
159
Follow the instructions for running Cayley locally:
1610

1711
```text
@@ -22,19 +16,11 @@ cd cayley
2216
# Download dependencies
2317
go mod download
2418
25-
# Download web files (optional)
19+
# Update web files (optional)
2620
2721
go run cmd/download_ui/download_ui.go
28-
29-
# Install packr 2
30-
31-
go get -u github.com/gobuffalo/packr/v2/packr2
3222
```
3323

34-
# Generate static files go modules
35-
36-
packr2
37-
3824
# build the binary
3925

4026
go build ./cmd/cayley
@@ -61,21 +47,11 @@ You can now open the WebUI in your browser: [http://127.0.0.1:64210](http://127.
6147

6248
## Hacking on Cayley
6349

64-
First, you'll need Go [\(version 1.11.x or greater\)](https://golang.org/doc/install) and a Go workspace. This is outlined by the Go team at [http://golang.org/doc/code.html](http://golang.org/doc/code.html) and is sort of the official way of going about it.
65-
66-
If your version of Go &lt; 1.13, you need to run:
67-
68-
```text
69-
export GO111MODULE=on
70-
```
71-
7250
If you just want to build Cayley and check out the source, or use it as a library, a simple `go get github.com/cayleygraph/cayley` will work!
7351

7452
But suppose you want to contribute back on your own fork \(and pull requests are welcome!\). A good way to do this is to set up your \$GOPATH and then...
7553

7654
```text
77-
mkdir -p $GOPATH/src/github.com/cayleygraph
78-
cd $GOPATH/src/github.com/cayleygraph
7955
git clone https://github.com/$GITHUBUSERNAME/cayley
8056
```
8157

@@ -97,7 +73,7 @@ With that in place, that folder will reflect your local fork, be able to take ch
9773
For iterating, it can be helpful to, from the directory, run
9874

9975
```text
100-
packr2 && go build ./cmd/cayley && ./cayley <subcommand> <your options>
76+
go build ./cmd/cayley && ./cayley <subcommand> <your options>
10177
```
10278

10379
Which will also resolve the relevant static content paths for serving HTTP.
@@ -106,16 +82,10 @@ Which will also resolve the relevant static content paths for serving HTTP.
10682

10783
## Running Unit Tests
10884

109-
If your version of Go &lt; 1.13, you need to run:
110-
111-
```text
112-
export GO111MODULE=on
113-
```
114-
11585
First, `cd` into the `cayley` project folder and run:
11686

11787
```text
118-
packr && go test ./...
88+
go test ./...
11989
```
12090

12191
If you have a Docker installed, you can also run tests for remote backend implementations:

docs/getting-involved/contributing.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@ cd cayley
2424
# Download dependencies
2525
go mod download
2626
27-
# Download web files (optional)
27+
# Update web files (optional)
2828
2929
go run cmd/download_ui/download_ui.go
30-
31-
# Install packr 2
32-
33-
go get -u github.com/gobuffalo/packr/v2/packr2
3430
```
3531

3632
## Generate static files go modules
@@ -117,7 +113,7 @@ export GO111MODULE=on
117113
First, `cd` into the `cayley` project folder and run:
118114

119115
```text
120-
packr && go test ./...
116+
go test ./...
121117
```
122118

123119
If you have a Docker installed, you can also run tests for remote backend implementations:

0 commit comments

Comments
 (0)