Merge pull request #31 from humio/mike/fix_release_procedures

Various fixes to release process

.github/workflows/ci.yaml

@@ -0,0 +1,24 @@
+name: CI
+
+on: push
+
+jobs:
+  build:
+    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.14
+      -
+        name: Build snapshot with GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: build --rm-dist --snapshot

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: goreleaser
 on:
   push:
     tags:
-      - '*'
+      - 'v*'
 
 jobs:
   goreleaser:
@@ -12,9 +12,8 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v2
-      -
-        name: Unshallow
-        run: git fetch --prune --unshallow
+        with:
+          fetch-depth: 0
       -
         name: Install Snapcraft
         uses: samuelmeuli/action-snapcraft@v1
@@ -40,6 +39,7 @@ jobs:
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
       -
         name: Clear
         if: always()

.goreleaser.yaml

@@ -2,6 +2,7 @@ project_name: humioctl
 
 builds:
   - binary: humioctl
+    main: ./cmd/humioctl
     goos:
       - windows
       - darwin
@@ -16,16 +17,18 @@ release:
     owner: humio
     name: cli
 
-#brews:
-#  -
-#    github:
-#      owner: humio
-#      name: homebrew-humio
-#    folder: Formula
-#    homepage:  https://humio.com/
-#    description: Manage and Stream Logs to Humio
-#    test: |
-#      system "echo DONE"
+brews:
+  -
+    tap:
+      owner: humio
+      name: homebrew-humio
+      token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
+    url_template: "https://github.com/humio/homebrew-humio/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
+    folder: Formula
+    homepage:  https://humio.com/
+    description: Manage and Stream Logs to Humio
+    test: |
+      system "echo DONE"
 
 archives:
   -
@@ -91,8 +94,3 @@ snapcrafts:
         # things they allow:
         # https://snapcraft.io/docs/reference/interfaces.
         plugs: ["home", "network"]
-
-#dockers:
-#  - image_templates:
-#    - humio/cli:latest
-#    - humio/cli:{{ .Tag }}

CHANGELOG.md

@@ -0,0 +1 @@
+See [https://github.com/humio/cli/releases](https://github.com/humio/cli/releases).

Makefile

@@ -10,30 +10,23 @@ all: build
 
 $(BIN_PATH): FORCE
 	@echo "--> Building Humio CLI"
-	go build -o $(BIN_PATH) main.go
+	go build -o $(BIN_PATH) cmd/humioctl/*.go
 
 build: $(BIN_PATH)
 
-get:
-	@echo "--> Fetching dependencies"
-	go get
-
-test:
-	@echo "--> Testing"
-	go test
-
 clean:
 	@echo "--> Cleaning"
 	go clean
 	@rm -rf bin/
 
-dist: clean
-	@echo "--> Tagging Git & Releasing"
-	./scripts/dist.sh
+snapshot:
+	@echo "--> Building snapshot"
+	goreleaser build --rm-dist --snapshot
+	@rm -rf bin/
 
 run: $(BIN_PATH)
 	$(BIN_PATH) $(CLI_COMMAND)
 
-.PHONY: build get clean dist run FORCE
+.PHONY: build clean snapshot run FORCE
 
 FORCE: