Skip to content

fix(cmd): cmd arch logic restored #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidmovas merged 1 commit into from
May 22, 2025
Merged

fix(cmd): cmd arch logic restored #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 2
builds:
- main: ./cmd/qube
- main: ./cmd
id: "qube"
binary: qube
ldflags:
- -s -w -X github.com/apiqube/cli/cmd/cli.Version={{.Version}}
- -s -w -X github.com/apiqube/cli/cmd/cli.Commit={{.ShortCommit}}
- -s -w -X github.com/apiqube/cli/cmd/cli.Date={{.Date}}
- -s -w -X main.Version={{.Version}}
- -s -w -X main.Commit={{.ShortCommit}}
- -s -w -X main.Date={{.Date}}
env:
- CGO_ENABLED=0
goos: [linux, darwin, windows]
Expand Down
6 changes: 3 additions & 3 deletions Taskfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
vars:
BINARY_NAME: qube
BUILD_DIR: C:/Users/admin/go/bin
MAIN: ./cmd/qube
MAIN: ./cmd
VERSION:
sh: git describe --tags --abbrev=0 2>/dev/null || echo "dev"

Expand All @@ -16,13 +16,13 @@ tasks:
desc: 🔧 Build Qube CLI
cmds:
- echo "🔧 Building {{.BINARY_NAME}} version {{.VERSION}}"
- go build -ldflags="-X github.com/apiqube/cli/cmd/cli.version={{.VERSION}}" -o={{.BUILD_DIR}}/{{.BINARY_NAME}}.exe {{.MAIN}}
- go build -ldflags="-X github.com/apiqube/cli/cmd.version={{.VERSION}}" -o={{.BUILD_DIR}}/{{.BINARY_NAME}}.exe {{.MAIN}}

build-versioned:
desc: 🔧 Build Qube CLI
cmds:
- echo "🔧 Building {{.BINARY_NAME}} version {{.VERSION}}"
- go build -ldflags="-X github.com/apiqube/cli/cmd/cli.version={{.VERSION}}" -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-{{.VERSION}}.exe {{.MAIN}}
- go build -ldflags="-X github.com/apiqube/cli/cmd.version={{.VERSION}}" -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-{{.VERSION}}.exe {{.MAIN}}

clean:
desc: 🧹 Clean build directory
Expand Down
0 cmd/cli/apply/apply.go → cmd/apply/apply.go
View file
Open in desktop
File renamed without changes.
0 cmd/cli/check/check.go → cmd/check/check.go
View file
Open in desktop
File renamed without changes.
0 cmd/cli/cleanup/cleanup.go → cmd/cleanup/cleanup.go
View file
Open in desktop
File renamed without changes.
0 cmd/cli/edit/edit.go → cmd/edit/edit.go
View file
Open in desktop
File renamed without changes.
0 cmd/cli/generator/generate.go → cmd/generator/generate.go
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions cmd/qube/main.go → cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package main

import (
"github.com/apiqube/cli/cmd/cli"
"github.com/apiqube/cli/internal/core/store"
uicli "github.com/apiqube/cli/ui/cli"
)
Expand All @@ -13,5 +12,5 @@ func main() {
store.Init()
defer store.Stop()

cli.Execute()
Execute()
}
0 cmd/cli/rollback/rollback.go → cmd/rollback/rollback.go
View file
Open in desktop
File renamed without changes.
17 changes: 8 additions & 9 deletions cmd/cli/root.go → cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
package cli
package main

import (
"context"
"os"
"os/signal"
"syscall"

"github.com/apiqube/cli/cmd/cli/edit"
"github.com/apiqube/cli/cmd/apply"
"github.com/apiqube/cli/cmd/check"
"github.com/apiqube/cli/cmd/cleanup"
"github.com/apiqube/cli/cmd/edit"
"github.com/apiqube/cli/cmd/generator"
"github.com/apiqube/cli/cmd/rollback"
"github.com/apiqube/cli/cmd/search"

"github.com/apiqube/cli/ui/cli"

"github.com/apiqube/cli/cmd/cli/apply"
"github.com/apiqube/cli/cmd/cli/check"
"github.com/apiqube/cli/cmd/cli/cleanup"
"github.com/apiqube/cli/cmd/cli/generator"
"github.com/apiqube/cli/cmd/cli/rollback"
"github.com/apiqube/cli/cmd/cli/search"

"github.com/apiqube/cli/internal/config"
"github.com/spf13/cobra"
)
Expand Down
0 cmd/cli/search/execution.go → cmd/search/execution.go
View file
Open in desktop
File renamed without changes.
0 cmd/cli/search/options.go → cmd/search/options.go
View file
Open in desktop
File renamed without changes.
0 cmd/cli/search/results.go → cmd/search/results.go
View file
Open in desktop
File renamed without changes.
0 cmd/cli/search/search.go → cmd/search/search.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions cmd/cli/version.go → cmd/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cli
package main

import (
"fmt"
Expand All @@ -13,7 +13,7 @@ var (
)

var versionCmd = &cobra.Command{
Use: "Version",
Use: "version",
Short: "Print the Version number",
SilenceUsage: true,
SilenceErrors: true,
Expand Down
Loading