From e141cb97d0d8ec3a5d2d40324286a08a7277f80f Mon Sep 17 00:00:00 2001 From: ayn2op Date: Fri, 10 Jan 2025 20:36:10 -0500 Subject: [PATCH] Revert "Initialize Go workspace (#483)" This reverts commit ea0206aed64ff159633342af506017f138cb1e3a. --- .github/workflows/ci.yml | 2 +- Makefile | 4 ---- README.md | 2 +- {cli/cmd => cmd}/guilds_tree.go | 0 {cli/cmd => cmd}/layout.go | 0 {cli/cmd => cmd}/login_form.go | 0 {cli/cmd => cmd}/message_input.go | 0 {cli/cmd => cmd}/messages_text.go | 0 {cli/cmd => cmd}/run.go | 0 {cli/cmd => cmd}/state.go | 0 cli/go.mod => go.mod | 0 cli/go.sum => go.sum | 0 go.work | 3 --- go.work.sum | 4 ---- {cli/internal => internal}/config/config.go | 0 {cli/internal => internal}/config/keys.go | 0 {cli/internal => internal}/config/theme.go | 0 {cli/internal => internal}/logger/logger.go | 0 {cli/internal => internal}/markdown/renderer.go | 0 cli/main.go => main.go | 0 20 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 Makefile rename {cli/cmd => cmd}/guilds_tree.go (100%) rename {cli/cmd => cmd}/layout.go (100%) rename {cli/cmd => cmd}/login_form.go (100%) rename {cli/cmd => cmd}/message_input.go (100%) rename {cli/cmd => cmd}/messages_text.go (100%) rename {cli/cmd => cmd}/run.go (100%) rename {cli/cmd => cmd}/state.go (100%) rename cli/go.mod => go.mod (100%) rename cli/go.sum => go.sum (100%) delete mode 100644 go.work delete mode 100644 go.work.sum rename {cli/internal => internal}/config/config.go (100%) rename {cli/internal => internal}/config/keys.go (100%) rename {cli/internal => internal}/config/theme.go (100%) rename {cli/internal => internal}/logger/logger.go (100%) rename {cli/internal => internal}/markdown/renderer.go (100%) rename cli/main.go => main.go (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f70e57c..5af3863 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: go-version: stable - name: Build - run: make + run: go build -ldflags "-s -w" . - 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 deleted file mode 100644 index 38b3b5c..0000000 --- a/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -LDFLAGS = "-s -w" - -build: - go build -ldflags $(LDFLAGS) ./cli diff --git a/README.md b/README.md index 12708ee..fca63cd 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ scoop install discordo ```bash git clone https://github.com/ayn2op/discordo cd discordo -make +go build . ``` ### Linux clipboard support diff --git a/cli/cmd/guilds_tree.go b/cmd/guilds_tree.go similarity index 100% rename from cli/cmd/guilds_tree.go rename to cmd/guilds_tree.go diff --git a/cli/cmd/layout.go b/cmd/layout.go similarity index 100% rename from cli/cmd/layout.go rename to cmd/layout.go diff --git a/cli/cmd/login_form.go b/cmd/login_form.go similarity index 100% rename from cli/cmd/login_form.go rename to cmd/login_form.go diff --git a/cli/cmd/message_input.go b/cmd/message_input.go similarity index 100% rename from cli/cmd/message_input.go rename to cmd/message_input.go diff --git a/cli/cmd/messages_text.go b/cmd/messages_text.go similarity index 100% rename from cli/cmd/messages_text.go rename to cmd/messages_text.go diff --git a/cli/cmd/run.go b/cmd/run.go similarity index 100% rename from cli/cmd/run.go rename to cmd/run.go diff --git a/cli/cmd/state.go b/cmd/state.go similarity index 100% rename from cli/cmd/state.go rename to cmd/state.go diff --git a/cli/go.mod b/go.mod similarity index 100% rename from cli/go.mod rename to go.mod diff --git a/cli/go.sum b/go.sum similarity index 100% rename from cli/go.sum rename to go.sum diff --git a/go.work b/go.work deleted file mode 100644 index f0252b8..0000000 --- a/go.work +++ /dev/null @@ -1,3 +0,0 @@ -go 1.23.4 - -use ./cli diff --git a/go.work.sum b/go.work.sum deleted file mode 100644 index b4c05df..0000000 --- a/go.work.sum +++ /dev/null @@ -1,4 +0,0 @@ -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= diff --git a/cli/internal/config/config.go b/internal/config/config.go similarity index 100% rename from cli/internal/config/config.go rename to internal/config/config.go diff --git a/cli/internal/config/keys.go b/internal/config/keys.go similarity index 100% rename from cli/internal/config/keys.go rename to internal/config/keys.go diff --git a/cli/internal/config/theme.go b/internal/config/theme.go similarity index 100% rename from cli/internal/config/theme.go rename to internal/config/theme.go diff --git a/cli/internal/logger/logger.go b/internal/logger/logger.go similarity index 100% rename from cli/internal/logger/logger.go rename to internal/logger/logger.go diff --git a/cli/internal/markdown/renderer.go b/internal/markdown/renderer.go similarity index 100% rename from cli/internal/markdown/renderer.go rename to internal/markdown/renderer.go diff --git a/cli/main.go b/main.go similarity index 100% rename from cli/main.go rename to main.go