Merge pull request #7 from nais/main_root

Move main package to root
nais · Jul 10, 2023 · 94ac8a1 · 94ac8a1
2 parents 09bb527 + 5db50cf
commit 94ac8a1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -6,7 +6,7 @@ builds:
       - darwin_arm64
     id: narc
     dir: .
-    main: ./cmd
+    main: ./
     binary: narc
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}}

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
 .PHONY: build
 
 build:
-	go build -o narc ./cmd/
+	go build -o narc ./
diff --git a/cmd/main.go → cmd/entrypoint.go b/cmd/main.go → cmd/entrypoint.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"log"
@@ -9,7 +9,7 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-func main() {
+func Run() {
 	app := &cli.App{
 		Name:        "narc",
 		Usage:       "NAIS Administrator CLI",

diff --git a/main.go b/main.go
@@ -0,0 +1,7 @@
+package main
+
+import "github.com/nais/narcos/cmd"
+
+func main() {
+	cmd.Run()
+}