Skip to content

Commit 1c2dd30

Browse files
committed
refactor: drop goscript for now
Signed-off-by: Christian Stewart <christian@aperture.us>
1 parent c711a03 commit 1c2dd30

File tree

7 files changed

+6
-24
lines changed

7 files changed

+6
-24
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ GOLANGCI_LINT=$(TOOLS_BIN)/golangci-lint
5454
GO_MOD_OUTDATED=$(TOOLS_BIN)/go-mod-outdated
5555
GORELEASER=$(TOOLS_BIN)/goreleaser
5656
WASMBROWSERTEST=$(TOOLS_BIN)/wasmbrowsertest
57-
GOSCRIPT=$(TOOLS_BIN)/goscript
57+
# GOSCRIPT=$(TOOLS_BIN)/goscript
5858

5959
# Mappings for build tool to Go import path
6060
$(eval $(call build_tool,$(PROTOC_GEN_GO),github.com/aperturerobotics/protobuf-go-lite/cmd/protoc-gen-go-lite))
@@ -66,7 +66,7 @@ $(eval $(call build_tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/c
6666
$(eval $(call build_tool,$(GO_MOD_OUTDATED),github.com/psampaz/go-mod-outdated))
6767
$(eval $(call build_tool,$(GORELEASER),github.com/goreleaser/goreleaser/v2))
6868
$(eval $(call build_tool,$(WASMBROWSERTEST),github.com/agnivade/wasmbrowsertest))
69-
$(eval $(call build_tool,$(GOSCRIPT),github.com/aperturerobotics/goscript/cmd/goscript))
69+
# $(eval $(call build_tool,$(GOSCRIPT),github.com/aperturerobotics/goscript/cmd/goscript))
7070

7171
.PHONY: protodeps
7272
protodeps: $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_STARPC) $(PROJECT_DIR)/node_modules

deps.go.tools

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929

3030
// _ imports wasmbrowsertest
3131
_ "github.com/agnivade/wasmbrowsertest"
32-
3332
// _ imports goscript
34-
_ "github.com/aperturerobotics/goscript/cmd/goscript"
33+
// _ "github.com/aperturerobotics/goscript/cmd/goscript"
3534
)

go.mod.tools

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ replace (
1111

1212
require (
1313
github.com/aperturerobotics/goprotowrap v0.3.2 // latest
14-
github.com/aperturerobotics/goscript v0.0.58 // master
14+
// github.com/aperturerobotics/goscript v0.0.58 // master
1515
github.com/aperturerobotics/protobuf-go-lite v0.11.0 // latest
1616
github.com/aperturerobotics/starpc v0.39.10 // latest
1717
)
@@ -95,7 +95,6 @@ require (
9595
github.com/anchore/go-logger v0.0.0-20241005132348-65b4486fbb28 // indirect
9696
github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb // indirect
9797
github.com/anchore/quill v0.5.1 // indirect
98-
github.com/aperturerobotics/cli v1.0.0 // indirect
9998
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
10099
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
101100
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
@@ -472,7 +471,6 @@ require (
472471
github.com/xanzy/ssh-agent v0.3.3 // indirect
473472
github.com/xen0n/gosmopolitan v1.3.0 // indirect
474473
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
475-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
476474
github.com/yagipy/maintidx v1.0.0 // indirect
477475
github.com/yeya24/promlinter v0.3.0 // indirect
478476
github.com/ykadowak/zerologlint v0.1.5 // indirect

go.sum.tools

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,8 @@ github.com/anchore/quill v0.5.1/go.mod h1:tAzfFxVluL2P1cT+xEy+RgQX1hpNuliUC5dTYS
187187
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
188188
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
189189
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
190-
github.com/aperturerobotics/cli v1.0.0 h1:s3xT2h7eBih4/4yZKTn/HQ6P+qpk6ygWZl2416xAI1M=
191-
github.com/aperturerobotics/cli v1.0.0/go.mod h1:wtlINjMcKuwyV1x4ftReuA6hHZcPB8kPMXHyQqGFCSc=
192190
github.com/aperturerobotics/goprotowrap v0.3.2 h1:Nb79Q6KEV3VjUEUNcYCfn9/C8uY5U71CFF16E/kokqE=
193191
github.com/aperturerobotics/goprotowrap v0.3.2/go.mod h1:5tRlYsb4VF0ySzx2/My3u9PtzTWNu5o2bqYHj0TRw+U=
194-
github.com/aperturerobotics/goscript v0.0.58 h1:fghZ+5SO5F4fgmnudIyRzrtA1uVnBz1In7UH+7VG2Mo=
195-
github.com/aperturerobotics/goscript v0.0.58/go.mod h1:PtShEZz/oPeI2DGNpNJXq/7fJhzbjuVD92dLsHePJL8=
196192
github.com/aperturerobotics/protobuf-go v1.33.1-0.20240516052628-4470bc019102 h1:jjQCud+wqlAoe+35nfTyuDzGk3tiG5t1BMFlRXHvg3A=
197193
github.com/aperturerobotics/protobuf-go v1.33.1-0.20240516052628-4470bc019102/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
198194
github.com/aperturerobotics/protobuf-go-lite v0.11.0 h1:IAaZISqrEpodqECYxk0yKWgROEbZtMhs7bErP+Zma9o=
@@ -1234,8 +1230,6 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm
12341230
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
12351231
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
12361232
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
1237-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
1238-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
12391233
github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM=
12401234
github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk=
12411235
github.com/yeya24/promlinter v0.3.0 h1:JVDbMp08lVCP7Y6NP3qHroGAO6z2yGKQtS5JsjqtoFs=

tools/deps.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030

3131
// _ imports wasmbrowsertest
3232
_ "github.com/agnivade/wasmbrowsertest"
33-
3433
// _ imports goscript
35-
_ "github.com/aperturerobotics/goscript/cmd/goscript"
34+
// _ "github.com/aperturerobotics/goscript/cmd/goscript"
3635
)

tools/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ replace (
1313
require (
1414
github.com/aperturerobotics/common v0.22.11 // latest
1515
github.com/aperturerobotics/goprotowrap v0.3.2 // latest
16-
github.com/aperturerobotics/goscript v0.0.58 // master
16+
// github.com/aperturerobotics/goscript v0.0.58 // master
1717
github.com/aperturerobotics/protobuf-go-lite v0.11.0 // latest
1818
github.com/aperturerobotics/starpc v0.39.10 // latest
1919
)
@@ -97,7 +97,6 @@ require (
9797
github.com/anchore/go-logger v0.0.0-20241005132348-65b4486fbb28 // indirect
9898
github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb // indirect
9999
github.com/anchore/quill v0.5.1 // indirect
100-
github.com/aperturerobotics/cli v1.0.0 // indirect
101100
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
102101
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
103102
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
@@ -474,7 +473,6 @@ require (
474473
github.com/xanzy/ssh-agent v0.3.3 // indirect
475474
github.com/xen0n/gosmopolitan v1.3.0 // indirect
476475
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
477-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
478476
github.com/yagipy/maintidx v1.0.0 // indirect
479477
github.com/yeya24/promlinter v0.3.0 // indirect
480478
github.com/ykadowak/zerologlint v0.1.5 // indirect

tools/go.sum

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,8 @@ github.com/anchore/quill v0.5.1/go.mod h1:tAzfFxVluL2P1cT+xEy+RgQX1hpNuliUC5dTYS
187187
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
188188
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
189189
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
190-
github.com/aperturerobotics/cli v1.0.0 h1:s3xT2h7eBih4/4yZKTn/HQ6P+qpk6ygWZl2416xAI1M=
191-
github.com/aperturerobotics/cli v1.0.0/go.mod h1:wtlINjMcKuwyV1x4ftReuA6hHZcPB8kPMXHyQqGFCSc=
192190
github.com/aperturerobotics/goprotowrap v0.3.2 h1:Nb79Q6KEV3VjUEUNcYCfn9/C8uY5U71CFF16E/kokqE=
193191
github.com/aperturerobotics/goprotowrap v0.3.2/go.mod h1:5tRlYsb4VF0ySzx2/My3u9PtzTWNu5o2bqYHj0TRw+U=
194-
github.com/aperturerobotics/goscript v0.0.58 h1:fghZ+5SO5F4fgmnudIyRzrtA1uVnBz1In7UH+7VG2Mo=
195-
github.com/aperturerobotics/goscript v0.0.58/go.mod h1:PtShEZz/oPeI2DGNpNJXq/7fJhzbjuVD92dLsHePJL8=
196192
github.com/aperturerobotics/protobuf-go v1.33.1-0.20240516052628-4470bc019102 h1:jjQCud+wqlAoe+35nfTyuDzGk3tiG5t1BMFlRXHvg3A=
197193
github.com/aperturerobotics/protobuf-go v1.33.1-0.20240516052628-4470bc019102/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
198194
github.com/aperturerobotics/protobuf-go-lite v0.11.0 h1:IAaZISqrEpodqECYxk0yKWgROEbZtMhs7bErP+Zma9o=
@@ -1234,8 +1230,6 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm
12341230
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
12351231
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
12361232
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
1237-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
1238-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
12391233
github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM=
12401234
github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk=
12411235
github.com/yeya24/promlinter v0.3.0 h1:JVDbMp08lVCP7Y6NP3qHroGAO6z2yGKQtS5JsjqtoFs=

0 commit comments

Comments
 (0)