From ea0206aed64ff159633342af506017f138cb1e3a Mon Sep 17 00:00:00 2001 From: Ayyan Date: Fri, 10 Jan 2025 20:33:18 -0500 Subject: [PATCH] Initialize Go workspace (#483) --- .github/workflows/ci.yml | 2 +- Makefile | 4 ++++ README.md | 2 +- {cmd => cli/cmd}/guilds_tree.go | 0 {cmd => cli/cmd}/layout.go | 0 {cmd => cli/cmd}/login_form.go | 0 {cmd => cli/cmd}/message_input.go | 0 {cmd => cli/cmd}/messages_text.go | 0 {cmd => cli/cmd}/run.go | 0 {cmd => cli/cmd}/state.go | 0 go.mod => cli/go.mod | 0 go.sum => cli/go.sum | 0 {internal => cli/internal}/config/config.go | 0 {internal => cli/internal}/config/keys.go | 0 {internal => cli/internal}/config/theme.go | 0 {internal => cli/internal}/logger/logger.go | 0 {internal => cli/internal}/markdown/renderer.go | 0 main.go => cli/main.go | 0 go.work | 3 +++ go.work.sum | 4 ++++ 20 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Makefile rename {cmd => cli/cmd}/guilds_tree.go (100%) rename {cmd => cli/cmd}/layout.go (100%) rename {cmd => cli/cmd}/login_form.go (100%) rename {cmd => cli/cmd}/message_input.go (100%) rename {cmd => cli/cmd}/messages_text.go (100%) rename {cmd => cli/cmd}/run.go (100%) rename {cmd => cli/cmd}/state.go (100%) rename go.mod => cli/go.mod (100%) rename go.sum => cli/go.sum (100%) rename {internal => cli/internal}/config/config.go (100%) rename {internal => cli/internal}/config/keys.go (100%) rename {internal => cli/internal}/config/theme.go (100%) rename {internal => cli/internal}/logger/logger.go (100%) rename {internal => cli/internal}/markdown/renderer.go (100%) rename main.go => cli/main.go (100%) create mode 100644 go.work create mode 100644 go.work.sum diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5af3863..f70e57c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: go-version: stable - name: Build - run: go build -ldflags "-s -w" . + run: make - uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..38b3b5c --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +LDFLAGS = "-s -w" + +build: + go build -ldflags $(LDFLAGS) ./cli diff --git a/README.md b/README.md index fca63cd..12708ee 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ scoop install discordo ```bash git clone https://github.com/ayn2op/discordo cd discordo -go build . +make ``` ### Linux clipboard support diff --git a/cmd/guilds_tree.go b/cli/cmd/guilds_tree.go similarity index 100% rename from cmd/guilds_tree.go rename to cli/cmd/guilds_tree.go diff --git a/cmd/layout.go b/cli/cmd/layout.go similarity index 100% rename from cmd/layout.go rename to cli/cmd/layout.go diff --git a/cmd/login_form.go b/cli/cmd/login_form.go similarity index 100% rename from cmd/login_form.go rename to cli/cmd/login_form.go diff --git a/cmd/message_input.go b/cli/cmd/message_input.go similarity index 100% rename from cmd/message_input.go rename to cli/cmd/message_input.go diff --git a/cmd/messages_text.go b/cli/cmd/messages_text.go similarity index 100% rename from cmd/messages_text.go rename to cli/cmd/messages_text.go diff --git a/cmd/run.go b/cli/cmd/run.go similarity index 100% rename from cmd/run.go rename to cli/cmd/run.go diff --git a/cmd/state.go b/cli/cmd/state.go similarity index 100% rename from cmd/state.go rename to cli/cmd/state.go diff --git a/go.mod b/cli/go.mod similarity index 100% rename from go.mod rename to cli/go.mod diff --git a/go.sum b/cli/go.sum similarity index 100% rename from go.sum rename to cli/go.sum diff --git a/internal/config/config.go b/cli/internal/config/config.go similarity index 100% rename from internal/config/config.go rename to cli/internal/config/config.go diff --git a/internal/config/keys.go b/cli/internal/config/keys.go similarity index 100% rename from internal/config/keys.go rename to cli/internal/config/keys.go diff --git a/internal/config/theme.go b/cli/internal/config/theme.go similarity index 100% rename from internal/config/theme.go rename to cli/internal/config/theme.go diff --git a/internal/logger/logger.go b/cli/internal/logger/logger.go similarity index 100% rename from internal/logger/logger.go rename to cli/internal/logger/logger.go diff --git a/internal/markdown/renderer.go b/cli/internal/markdown/renderer.go similarity index 100% rename from internal/markdown/renderer.go rename to cli/internal/markdown/renderer.go diff --git a/main.go b/cli/main.go similarity index 100% rename from main.go rename to cli/main.go diff --git a/go.work b/go.work new file mode 100644 index 0000000..f0252b8 --- /dev/null +++ b/go.work @@ -0,0 +1,3 @@ +go 1.23.4 + +use ./cli diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 0000000..b4c05df --- /dev/null +++ b/go.work.sum @@ -0,0 +1,4 @@ +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=