diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 2b47365..ba2fd72 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v5 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v6 with: go-version: '1.25.4' @@ -24,7 +24,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender_models_deploy_key chmod 600 ~/.ssh/textsender_models_deploy_key - ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts + ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/textsender_models_deploy_key diff --git a/Makefile b/Makefile index c081f70..e9ce19d 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,17 @@ GO_VERSION ?= $(shell go version | awk '{print $$3}') .PHONY: build build: go build -ldflags="\ - -X 'git.kundeng.us/phoenix/clean_file/version.Version=$(VERSION)' \ - -X 'git.kundeng.us/phoenix/clean_file/version.BuildTime=$(BUILD_TIME)' \ - -X 'git.kundeng.us/phoenix/clean_file/version.Commit=$(COMMIT)' \ - -X 'git.kundeng.us/phoenix/clean_file/version.GoVersion=$(GO_VERSION)'" \ - -o clean_file main.go + -X 'git.kundeng.us/phoenix/clean_file/internal/version.Version=$(VERSION)' \ + -X 'git.kundeng.us/phoenix/clean_file/internal/version.BuildTime=$(BUILD_TIME)' \ + -X 'git.kundeng.us/phoenix/clean_file/internal/version.Commit=$(COMMIT)' \ + -X 'git.kundeng.us/phoenix/clean_file/internal/version.GoVersion=$(GO_VERSION)'" \ + -o clean_file cmd/clean_file/main.go .PHONY: install install: go install -ldflags="\ - -X 'git.kundeng.us/phoenix/clean_file/version.Version=$(VERSION)' \ - -X 'git.kundeng.us/phoenix/clean_file/version.BuildTime=$(BUILD_TIME)' \ - -X 'git.kundeng.us/phoenix/clean_file/version.Commit=$(COMMIT)' \ - -X 'git.kundeng.us/phoenix/clean_file/version.GoVersion=$(GO_VERSION)'" + -X 'git.kundeng.us/phoenix/clean_file/internal/version.Version=$(VERSION)' \ + -X 'git.kundeng.us/phoenix/clean_file/internal/version.BuildTime=$(BUILD_TIME)' \ + -X 'git.kundeng.us/phoenix/clean_file/internal/version.Commit=$(COMMIT)' \ + -X 'git.kundeng.us/phoenix/clean_file/internal/version.GoVersion=$(GO_VERSION)'" + -o clean_file cmd/clean_file/main.go diff --git a/main.go b/cmd/clean_file/main.go similarity index 83% rename from main.go rename to cmd/clean_file/main.go index 6878364..3f00d4a 100644 --- a/main.go +++ b/cmd/clean_file/main.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "git.kundeng.us/phoenix/clean_file/parser" - "git.kundeng.us/phoenix/clean_file/version" + "git.kundeng.us/phoenix/clean_file/internal/parser" + "git.kundeng.us/phoenix/clean_file/internal/version" ) func main() { diff --git a/go.mod b/go.mod index a8fc3d6..c3e9a25 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,6 @@ module git.kundeng.us/phoenix/clean_file go 1.25.4 -require git.kundeng.us/phoenix/textsender-models v0.0.9 +require git.kundeng.us/phoenix/textsender-models v0.0.10 require github.com/google/uuid v1.6.0 // indirect diff --git a/go.sum b/go.sum index 24f07a9..b83c284 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -git.kundeng.us/phoenix/textsender-models v0.0.9 h1:wHEbDLYzMpXQ8OaIf05xFY1V19iTpQogTJEuKInkjEQ= -git.kundeng.us/phoenix/textsender-models v0.0.9/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0= +git.kundeng.us/phoenix/textsender-models v0.0.10 h1:0AMe/zm4Xte2BcuqqhRP7+42m+4To+rUnHkR2a9eXlI= +git.kundeng.us/phoenix/textsender-models v0.0.10/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/parser/parser.go b/internal/parser/parser.go similarity index 98% rename from parser/parser.go rename to internal/parser/parser.go index 5d7c71d..2fca5ab 100644 --- a/parser/parser.go +++ b/internal/parser/parser.go @@ -9,7 +9,7 @@ import ( "strings" "unicode" - "git.kundeng.us/phoenix/textsender-models/pkg/contact" + "git.kundeng.us/phoenix/textsender-models/tx0/contact" ) const Letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" diff --git a/parser/parser_test.go b/internal/parser/parser_test.go similarity index 92% rename from parser/parser_test.go rename to internal/parser/parser_test.go index e0321ce..7cb0632 100644 --- a/parser/parser_test.go +++ b/internal/parser/parser_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "git.kundeng.us/phoenix/textsender-models/pkg/contact" + "git.kundeng.us/phoenix/textsender-models/tx0/contact" ) -const Test_File_Path = "../tests/numbers.txt" +const Test_File_Path = "../../tests/numbers.txt" // Remove duplicates func Test_RemoveDups(t *testing.T) { diff --git a/version/version.go b/internal/version/version.go similarity index 100% rename from version/version.go rename to internal/version/version.go