Merge pull request #4 from korosuke613/refactor

ci: add +docker

.github/workflows/ci.yaml

@@ -35,5 +35,7 @@ jobs:
       - run: "sudo /bin/sh -c 'wget https://github.com/earthly/earthly/releases/download/v0.5.7/earthly-linux-amd64 -O /usr/local/bin/earthly && chmod +x /usr/local/bin/earthly'"
       - name: Earthly version
         run: earthly --version
-      - name: Run lint
+      - name: +build
         run: earthly --ci --use-inline-cache --push +build
+      - name: +docker
+        run: earthly --ci --use-inline-cache --push +docker

.goreleaser.yml

@@ -9,7 +9,7 @@
 builds:
   - env:
       - CGO_ENABLED=0
-    main: ./src/main.go
+    main: ./main.go
     goos:
       - linux
       - windows

Earthfile

@@ -2,9 +2,12 @@
 
 FROM golang:1.16
 WORKDIR /work
+ENV GO111MODULE=on
 
 src:
-    COPY ./src /work/src
+    COPY ./cmd ./cmd
+    COPY ./lib ./lib
+    COPY ./main.go ./
     COPY go.mod go.sum ./
 
 deps:
@@ -23,7 +26,7 @@ lint:
 build:
     FROM +deps
 
-    RUN go build -o build/tempura ./src/main.go
+    RUN go build -o build/tempura ./main.go
     SAVE ARTIFACT build/tempura /tempura AS LOCAL build/tempura
 
 goreleaser-setup:

src/cmd/root.go → cmd/root.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/korosuke613/tempura/src/lib"
+	"github.com/korosuke613/tempura/lib"
 	"github.com/spf13/cobra"
 	"os"
 )
@@ -31,8 +31,8 @@ func newRootCmd() *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "tempura",
-		Short: "tempura is a generator that fills in templates.",
-		Long:  `A Fast and Flexible Template Fill Generator built with love by korosuke613 in Go.`,
+		Short: "tempura is a Tool that fills in templates.",
+		Long:  `A Fast and Flexible Template Fill Tool built with love by korosuke613 in Go.`,
 		RunE: func(_ *cobra.Command, args []string) error {
 			if showVersion {
 				printVersion()

src/main.go → main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/korosuke613/tempura/src/cmd"
+	"github.com/korosuke613/tempura/cmd"
 )
 
 func main() {