Merge pull request #11 from mr-karan/master

Restructure top level go files and add Github Actions
zerodha · Mar 19, 2021 · e336050 · e336050
2 parents 2e37ab3 + ed57d9a
commit e336050
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 84 deletions.
diff --git a/.circleci/config.toml b/.circleci/config.toml
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,28 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+      - "v*" # Will trigger only if tag is pushed matching pattern `v*` (Eg: `v0.1.0`)
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: --parallelism 1 --rm-dist --skip-validate
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 config_test.toml
+# binary file produced by `make build`.
+sql-jobber
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -11,6 +11,7 @@ builds:
       - netbsd
     goarch:
       - amd64
+    dir: ./cmd/
 
 # Archive customization
 archives:

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ BIN := sql-jobber
 .PHONY: build
 build:
 	# Compile the main application.
-	go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}'"
+	go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}'" ./cmd/
 
 .PHONY: test
 test:

diff --git a/db.go → cmd/db.go b/db.go → cmd/db.go
diff --git a/http.go → cmd/http.go b/http.go → cmd/http.go
diff --git a/jobber.go → cmd/jobber.go b/jobber.go → cmd/jobber.go
diff --git a/jobber_test.go → cmd/jobber_test.go b/jobber_test.go → cmd/jobber_test.go
diff --git a/main.go → cmd/main.go b/main.go → cmd/main.go
diff --git a/results.go → cmd/results.go b/results.go → cmd/results.go
diff --git a/tasks.go → cmd/tasks.go b/tasks.go → cmd/tasks.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ builds: @@
           - netbsd
         goarch:
           - amd64
+        dir: ./cmd/
     # Archive customization
     archives:
@@ Expand Down @@