From 8586af4d8a7d5dbd41dc41c00448fc2b5e1b8b0b Mon Sep 17 00:00:00 2001 From: Jaz Volpert Date: Wed, 12 Jul 2023 22:42:50 +0000 Subject: [PATCH] Move version and testscripts --- cmd/beemo/main.go | 2 +- cmd/bigsky/main.go | 2 +- cmd/fakermaker/main.go | 2 +- cmd/gosky/main.go | 2 +- cmd/labelmaker/main.go | 2 +- cmd/laputa/main.go | 2 +- cmd/palomar/main.go | 2 +- cmd/sonar/main.go | 2 +- cmd/stress/main.go | 2 +- fakedata/accounts.go | 2 +- labeler/hiveai.go | 2 +- labeler/micro_nsfw_img.go | 2 +- labeler/sqrl.go | 2 +- labeler/xrpc_endpoints.go | 2 +- search/server.go | 2 +- {testscripts => testing/testscripts}/cleanup.sh | 0 {testscripts => testing/testscripts}/pdstest.sh | 0 {version => util/version}/version.go | 0 xrpc/xrpc.go | 2 +- 19 files changed, 16 insertions(+), 16 deletions(-) rename {testscripts => testing/testscripts}/cleanup.sh (100%) rename {testscripts => testing/testscripts}/pdstest.sh (100%) rename {version => util/version}/version.go (100%) diff --git a/cmd/beemo/main.go b/cmd/beemo/main.go index e8025549..35025a2f 100644 --- a/cmd/beemo/main.go +++ b/cmd/beemo/main.go @@ -15,7 +15,7 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/util" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/bluesky-social/indigo/xrpc" _ "github.com/joho/godotenv/autoload" diff --git a/cmd/bigsky/main.go b/cmd/bigsky/main.go index c4088b6c..de5a818d 100644 --- a/cmd/bigsky/main.go +++ b/cmd/bigsky/main.go @@ -17,7 +17,7 @@ import ( "github.com/bluesky-social/indigo/plc" "github.com/bluesky-social/indigo/repomgr" "github.com/bluesky-social/indigo/util/cliutil" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/bluesky-social/indigo/xrpc" _ "net/http/pprof" diff --git a/cmd/fakermaker/main.go b/cmd/fakermaker/main.go index eb2ec43e..41f985e2 100644 --- a/cmd/fakermaker/main.go +++ b/cmd/fakermaker/main.go @@ -12,7 +12,7 @@ import ( "github.com/bluesky-social/indigo/fakedata" "github.com/bluesky-social/indigo/util/cliutil" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" _ "github.com/joho/godotenv/autoload" diff --git a/cmd/gosky/main.go b/cmd/gosky/main.go index 56c2dd69..8f9a023a 100644 --- a/cmd/gosky/main.go +++ b/cmd/gosky/main.go @@ -24,7 +24,7 @@ import ( "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/util" "github.com/bluesky-social/indigo/util/cliutil" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/bluesky-social/indigo/xrpc" lru "github.com/hashicorp/golang-lru" diff --git a/cmd/labelmaker/main.go b/cmd/labelmaker/main.go index c8bc9e54..22d56c1f 100644 --- a/cmd/labelmaker/main.go +++ b/cmd/labelmaker/main.go @@ -8,7 +8,7 @@ import ( "github.com/bluesky-social/indigo/carstore" "github.com/bluesky-social/indigo/labeler" "github.com/bluesky-social/indigo/util/cliutil" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/urfave/cli/v2" _ "github.com/joho/godotenv/autoload" diff --git a/cmd/laputa/main.go b/cmd/laputa/main.go index afdc00d4..80adcadd 100644 --- a/cmd/laputa/main.go +++ b/cmd/laputa/main.go @@ -9,7 +9,7 @@ import ( "github.com/bluesky-social/indigo/pds" "github.com/bluesky-social/indigo/plc" "github.com/bluesky-social/indigo/util/cliutil" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" _ "github.com/joho/godotenv/autoload" diff --git a/cmd/palomar/main.go b/cmd/palomar/main.go index e5873057..19de9183 100644 --- a/cmd/palomar/main.go +++ b/cmd/palomar/main.go @@ -13,7 +13,7 @@ import ( "github.com/bluesky-social/indigo/search" "github.com/bluesky-social/indigo/util/cliutil" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" logging "github.com/ipfs/go-log" es "github.com/opensearch-project/opensearch-go/v2" cli "github.com/urfave/cli/v2" diff --git a/cmd/sonar/main.go b/cmd/sonar/main.go index 8c653056..6d87af01 100644 --- a/cmd/sonar/main.go +++ b/cmd/sonar/main.go @@ -14,7 +14,7 @@ import ( "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/sonar" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/gorilla/websocket" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" diff --git a/cmd/stress/main.go b/cmd/stress/main.go index 1d147cad..61b1a8fd 100644 --- a/cmd/stress/main.go +++ b/cmd/stress/main.go @@ -16,7 +16,7 @@ import ( "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/testing" "github.com/bluesky-social/indigo/util/cliutil" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/bluesky-social/indigo/xrpc" "github.com/ipfs/go-cid" diff --git a/fakedata/accounts.go b/fakedata/accounts.go index aeb5a43d..c8b9892e 100644 --- a/fakedata/accounts.go +++ b/fakedata/accounts.go @@ -8,7 +8,7 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/util" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/bluesky-social/indigo/xrpc" ) diff --git a/labeler/hiveai.go b/labeler/hiveai.go index e6780d04..0e8da740 100644 --- a/labeler/hiveai.go +++ b/labeler/hiveai.go @@ -11,7 +11,7 @@ import ( lexutil "github.com/bluesky-social/indigo/lex/util" "github.com/bluesky-social/indigo/util" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" ) type HiveAILabeler struct { diff --git a/labeler/micro_nsfw_img.go b/labeler/micro_nsfw_img.go index 3a3912b2..f64a3854 100644 --- a/labeler/micro_nsfw_img.go +++ b/labeler/micro_nsfw_img.go @@ -11,7 +11,7 @@ import ( lexutil "github.com/bluesky-social/indigo/lex/util" util "github.com/bluesky-social/indigo/util" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" ) type MicroNSFWImgLabeler struct { diff --git a/labeler/sqrl.go b/labeler/sqrl.go index 139f0ffe..ea50b953 100644 --- a/labeler/sqrl.go +++ b/labeler/sqrl.go @@ -10,7 +10,7 @@ import ( appbsky "github.com/bluesky-social/indigo/api/bsky" "github.com/bluesky-social/indigo/util" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" ) type SQRLLabeler struct { diff --git a/labeler/xrpc_endpoints.go b/labeler/xrpc_endpoints.go index bf663b24..6c05f87c 100644 --- a/labeler/xrpc_endpoints.go +++ b/labeler/xrpc_endpoints.go @@ -6,7 +6,7 @@ import ( atproto "github.com/bluesky-social/indigo/api/atproto" label "github.com/bluesky-social/indigo/api/label" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/labstack/echo/v4" "go.opentelemetry.io/otel" diff --git a/search/server.go b/search/server.go index ae9420e4..3efc1f80 100644 --- a/search/server.go +++ b/search/server.go @@ -17,7 +17,7 @@ import ( lexutil "github.com/bluesky-social/indigo/lex/util" "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/repomgr" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" "github.com/bluesky-social/indigo/xrpc" "github.com/gorilla/websocket" diff --git a/testscripts/cleanup.sh b/testing/testscripts/cleanup.sh similarity index 100% rename from testscripts/cleanup.sh rename to testing/testscripts/cleanup.sh diff --git a/testscripts/pdstest.sh b/testing/testscripts/pdstest.sh similarity index 100% rename from testscripts/pdstest.sh rename to testing/testscripts/pdstest.sh diff --git a/version/version.go b/util/version/version.go similarity index 100% rename from version/version.go rename to util/version/version.go diff --git a/xrpc/xrpc.go b/xrpc/xrpc.go index 7bed73e2..50e95aac 100644 --- a/xrpc/xrpc.go +++ b/xrpc/xrpc.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/bluesky-social/indigo/util" - "github.com/bluesky-social/indigo/version" + "github.com/bluesky-social/indigo/util/version" ) type Client struct { -- 2.51.2