Skip to content

Commit 5b24f36

Browse files
doscodosco
committed
fix: cleanup
1 parent 3fb8338 commit 5b24f36

File tree

14 files changed

+55
-1470
lines changed

14 files changed

+55
-1470
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
11
{
2-
"name": "Graphjin Dev",
3-
"dockerComposeFile": "docker-compose.dev.yml",
4-
"service": "app",
2+
"name": "Graphjin Dev",
3+
"dockerComposeFile": "docker-compose.dev.yml",
4+
"service": "app",
55
"shutdownAction": "stopCompose",
6-
"workspaceFolder": "/workspace",
6+
"workspaceFolder": "/workspace",
77
"settings": {
88
"#terminal.integrated.defaultProfile.linux#": "/bin/bash",
9-
"[go]": {
10-
"editor.formatOnSave": true
11-
},
12-
"go.useLanguageServer": true,
13-
"go.testFlags": [
14-
"-short",
15-
"-v"
16-
],
17-
"go.testTimeout": "30m"
18-
9+
"[go]": {
10+
"editor.formatOnSave": true
11+
},
12+
"go.useLanguageServer": true,
13+
"go.testFlags": ["-short", "-v"],
14+
"go.testTimeout": "30m"
1915
},
20-
21-
// Add the IDs of extensions you want installed when the container is created.
22-
"extensions": [
23-
"golang.go",
24-
"mhutchie.git-graph"
25-
],
2616

27-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
28-
"forwardPorts": [8080],
17+
// Add the IDs of extensions you want installed when the container is created.
18+
"extensions": ["golang.go", "mhutchie.git-graph"],
19+
20+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
21+
"forwardPorts": [8080]
2922

30-
// Uncomment the next line if you want start specific services in your Docker Compose config.
31-
// "runServices": [],
23+
// Uncomment the next line if you want start specific services in your Docker Compose config.
24+
// "runServices": [],
3225

33-
// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
34-
// "shutdownAction": "none",
26+
// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
27+
// "shutdownAction": "none",
3528

36-
// Uncomment the next line to run commands after the container is created - for example installing curl.
37-
// "postCreateCommand": "apt-get update && apt-get install -y curl",
29+
// Uncomment the next line to run commands after the container is created - for example installing curl.
30+
// "postCreateCommand": "apt-get update && apt-get install -y curl",
3831

39-
// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
40-
// "remoteUser": "vscode"
32+
// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
33+
// "remoteUser": "vscode"
4134
}

‎.devcontainer/docker-compose.dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
version: "3.8"
22
services:
33
db:
4-
image: postgres:12
4+
image: postgres:16
55
environment:
66
POSTGRES_USER: postgres
77
POSTGRES_PASSWORD: postgres
88
ports:
99
- "5432:5432"
10-
10+
1111
app:
1212
build:
1313
context: ..
@@ -30,4 +30,4 @@ services:
3030
volumes:
3131
my-app:
3232
vscode-extensions:
33-
vscode-extensions-insiders:
33+
vscode-extensions-insiders:

‎Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ ifndef GOPATH
1212
override GOPATH = $(HOME)/go
1313
endif
1414

15-
export GO111MODULE := on
15+
# export GO111MODULE := on
1616

1717
# Build-time Go variables
1818
BUILD_FLAGS ?= -ldflags '-s -w -X "main.version=${BUILD_VERSION}" -X "main.commit=${BUILD}" -X "main.date=${BUILD_DATE}" -X "github.com/dosco/graphjin/serv/v3.version=${BUILD_VERSION}"'
1919

2020
.PHONY: all download-tools build wasm-build gen clean tidy test test-norace run run-github-actions lint changlog release version help $(PLATFORMS)
2121

2222
tidy:
23-
@go mod tidy -go=1.16 && go mod tidy -go=1.17
23+
@find . -name "go.mod" -execdir go mod tidy \;
2424

2525
test:
2626
@go test -v -race $(PACKAGES)
@@ -70,17 +70,17 @@ gen: download-tools
7070
@go generate ./...
7171

7272
$(BINARY):
73-
@CGO_ENABLED=0 go build $(BUILD_FLAGS) -o $(BINARY) cmd/*.go
73+
@CGO_ENABLED=0 GOTOOLCHAIN=auto go build $(BUILD_FLAGS) -o $(BINARY) cmd/*.go
7474
$(WASM):
7575
@cp $(GOROOT)/misc/wasm/wasm_exec.js ./wasm/js/
76-
@GOOS=js GOARCH=wasm go build -o ./wasm/graphjin.wasm ./wasm/*.go
76+
@GOOS=js GOARCH=wasm GOTOOLCHAIN=auto go build -o ./wasm/graphjin.wasm ./wasm/*.go
7777

7878
clean:
7979
@rm -f $(BINARY)
8080
@rm -f $(WASM)
8181

8282
run: clean
83-
@go run $(BUILD_FLAGS) cmd/*.go $(ARGS)
83+
@GOTOOLCHAIN=auto go run $(BUILD_FLAGS) cmd/*.go $(ARGS)
8484

8585
run-github-actions:
8686
@act push --job linter

‎auth/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/adjust/gorails v0.0.0-20171013043634-2786ed0c03d3
77
github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874
8-
github.com/dosco/graphjin/core/v3 v3.0.0-20240503072632-ee9ecd63cbc1
8+
github.com/dosco/graphjin/core/v3 v3.0.31
99
github.com/golang-jwt/jwt v3.2.2+incompatible
1010
github.com/gomodule/redigo v1.9.2
1111
github.com/gorilla/websocket v1.5.1

‎cmd/go.mod

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
module github.com/dosco/graphjin/cmd/v3
22

3-
go 1.21
4-
5-
toolchain go1.21.0
3+
go 1.18
64

75
require (
86
github.com/brianvoe/gofakeit/v6 v6.28.0
97
github.com/dop251/goja v0.0.0-20240220182346-e401ed450204
10-
github.com/dosco/graphjin/core/v3 v3.0.0-20240503072632-ee9ecd63cbc1
11-
github.com/dosco/graphjin/serv/v3 v3.0.0-20240503072632-ee9ecd63cbc1
8+
github.com/dosco/graphjin/core/v3 v3.0.31
9+
github.com/dosco/graphjin/serv/v3 v3.0.31
1210
github.com/gosimple/slug v1.14.0
1311
github.com/jackc/pgx/v5 v5.5.5
1412
github.com/jvatic/goja-babel v0.0.0-20240430111315-efc2226a021f
@@ -48,8 +46,6 @@ require (
4846
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
4947
github.com/dimchansky/utfbom v1.1.1 // indirect
5048
github.com/dlclark/regexp2 v1.11.0 // indirect
51-
github.com/dosco/graphjin/auth/v3 v3.0.0-20240503072632-ee9ecd63cbc1 // indirect
52-
github.com/dosco/graphjin/plugin/otel/v3 v3.0.0-20240503072632-ee9ecd63cbc1 // indirect
5349
github.com/fatih/color v1.16.0 // indirect
5450
github.com/felixge/httpsnoop v1.0.4 // indirect
5551
github.com/fsnotify/fsnotify v1.7.0 // indirect

‎conf/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/dosco/graphjin/conf/v3
33
go 1.18
44

55
require (
6-
github.com/dosco/graphjin/core/v3 v3.0.0-20230131095039-2864a2e4a4db
6+
github.com/dosco/graphjin/core/v3 v3.0.31
77
gopkg.in/yaml.v3 v3.0.1
88
)
99

‎core/go.sum

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
22
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
3-
github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
4-
github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
5-
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
6-
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7-
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
8-
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
93
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
104
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=

‎go.work

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
go 1.21
1+
go 1.18
2+
3+
toolchain go1.23.1
24

35
use (
4-
./core
5-
./conf
6-
./tests
7-
./serv
86
./auth
97
./cmd
10-
./wasm
8+
./conf
9+
./core
1110
./plugin/otel
11+
./serv
12+
./tests
13+
./wasm
1214
)

0 commit comments

Comments
 (0)