feat: Add CI and CD

mbamber · mbamber · commit cba2fda3321d · 2020-08-17T21:23:41.000+01:00
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -0,0 +1,106 @@
+name: CD
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  prebuild:
+    name: Prebuild
+    runs-on: ubuntu-latest
+    outputs:
+      newversion: ${{ env.NEW_VERSION }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        ref: ${{ github.ref }}
+        fetch-depth: 0 # Include all history as we need that to determine the next version
+    - name: Determine New Version
+      run: echo "::set-env name=NEW_VERSION::$(make local-version)"
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    needs:
+      prebuild
+    strategy:
+      matrix:
+        os: [darwin, linux]
+        arch: [amd64]
+    outputs:
+      newversion: ${{ needs.prebuild.outputs.newversion }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        ref: ${{ github.ref }}
+    - name: Bootstrap
+      run: make bootstrap
+    - name: Build
+      run: make NEW_VERSION=${{ needs.prebuild.outputs.newversion }}
+      env:
+        TARGET_OS: ${{ matrix.os }}
+        TARGET_ARCH: ${{ matrix.arch }}
+    - name: Save Artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: ccp-${{ matrix.os }}-${{ matrix.arch }}
+        path: bin/ccp
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    needs:
+      build
+    outputs:
+      uploadurl: ${{ steps.create-release.outputs.upload_url }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        ref: ${{ github.ref }}
+        fetch-depth: 0
+    - name: Tag
+      run: |
+        git config user.name github-actions
+        git config user.email github-actions@github.com
+        git tag -a ${{ needs.build.outputs.newversion }} -m ${{ needs.build.outputs.newversion }}
+        git push --tags
+    - name: Create Release
+      id: create-release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ needs.build.outputs.newversion }}
+        release_name: v${{ needs.build.outputs.newversion }}
+        draft: false
+        prerelease: false
+
+  upload-artifacts:
+    name: Upload Artifacts
+    runs-on: ubuntu-latest
+    needs:
+      release
+    strategy:
+      matrix:
+        os: [darwin, linux]
+        arch: [amd64]
+    steps:
+    - name: Download Artifact
+      uses: actions/download-artifact@v2
+      with:
+        name: ccp-${{ matrix.os }}-${{ matrix.arch }}
+    - name: Make Artifact Executable # See https://github.com/actions/upload-artifact/issues/38
+      run: chmod +x ./ccp
+    - name: Upload Asset
+      id: upload-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.release.outputs.uploadurl }}
+        asset_path: ./ccp
+        asset_name: ccp-${{ matrix.os }}-${{ matrix.arch }}
+        asset_content_type: "application"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,22 @@
+name: CI
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  validate:
+    name: Validate
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        ref: ${{ github.ref }}
+    - name: Build
+      run: make alpha # No need to bootstrap
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: ccp
+        path: bin/ccp
diff --git a/Makefile b/Makefile
@@ -1,18 +1,29 @@
-newversion := $(shell go run . version)
-newversion ?= 0.1.0
+GOBIN ?= ${PWD}
+NEW_VERSION ?= 0.1.0
+TARGET_OS ?= $(shell go env GOOS)
+TARGET_ARCH ?= $(shell go env GOARCH)
 
 .DEFAULT_GOAL := build
 
+.PHONY: bootstrap
+bootstrap:
+	@GOBIN=${GOBIN} go get github.com/mitchellh/gox
+	@go mod download
+
 .PHONY: clean
 clean:
 	@rm -rf bin
 
 .PHONY: alpha
 alpha: clean
 	@mkdir -p bin
-	@go build -o bin -ldflags="-X main.applicationVersion=${newversion}-alpha"
+	@go build -o bin -ldflags="-X main.applicationVersion=$(shell date +%s)-alpha"
 
 .PHONY: build
 build: clean
 	@mkdir -p bin
-	@go build -o bin -ldflags="-X main.applicationVersion=${newversion}"
+	@${GOBIN}/gox -os=${TARGET_OS} -arch=${TARGET_ARCH} -output bin/ccp -ldflags="-X main.applicationVersion=${NEW_VERSION}"
+
+.PHONY: local-version
+local-version:
+	@go run . version
diff --git a/git/git.go b/git/git.go
@@ -51,7 +51,8 @@ func getCommits(r *git.Repository, from, to string) ([]string, error) {
 	for {
 		c, err := iter.Next()
 		if err != nil {
-			return nil, err
+			xlog.Debug("No more messages to parse")
+			break
 		}
 
 		if c.Hash.String() == fromHash.String() {
@@ -60,6 +61,7 @@ func getCommits(r *git.Repository, from, to string) ([]string, error) {
 
 		messages = append(messages, c.Message)
 	}
+	xlog.Debugf("Got messages: %v", messages)
 	return messages, nil
 }
 
diff --git a/git/git_internal_test.go b/git/git_internal_test.go
@@ -109,6 +109,8 @@ func createTag(t *testing.T, r *git.Repository, tag string) {
 func TestGetCommits(t *testing.T) {
 	const (
 		b1 = "b1"
+		b2 = "b2"
+		b3 = "b3"
 
 		c1 = "first commit"
 		c2 = "second commit"
@@ -201,6 +203,21 @@ func TestGetCommits(t *testing.T) {
 				c3,
 			},
 		},
+		"to before from": {
+			setup: func(t *testing.T) *git.Repository {
+				r := createRepository(t)
+				createBranch(t, r, b1)
+				createCommit(t, r, c1)
+				createCommit(t, r, c2)
+				createCommit(t, r, c3)
+				return r
+			},
+			from: head,
+			to:   head2,
+			expected: []string{
+				c1,
+			},
+		},
 	}
 
 	for name, data := range cases {
@@ -255,18 +272,6 @@ func TestGetCommitsError(t *testing.T) {
 			from: head1,
 			to:   "bad",
 		},
-		"to before from": {
-			setup: func(t *testing.T) *git.Repository {
-				r := createRepository(t)
-				createBranch(t, r, b1)
-				createCommit(t, r, c1)
-				createCommit(t, r, c2)
-				createCommit(t, r, c3)
-				return r
-			},
-			from: head,
-			to:   head2,
-		},
 	}
 
 	for name, data := range cases {
diff --git a/go.mod b/go.mod
@@ -4,7 +4,9 @@ go 1.13
 
 require (
 	github.com/Masterminds/semver v1.5.0
+	github.com/hashicorp/go-version v1.2.1 // indirect
 	github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff
+	github.com/mitchellh/gox v1.0.1 // indirect
 	github.com/spf13/cobra v1.0.0
 	github.com/stretchr/testify v1.6.1
 	github.com/xfxdev/xlog v0.0.0-20190115101715-8752a0193860
diff --git a/go.sum b/go.sum
@@ -51,8 +51,13 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8=
+github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
+github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
@@ -78,6 +83,10 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI=
+github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4=
+github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY=
+github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ func getCommits(r *git.Repository, from, to string) ([]string, error) {`
`51`	`51`	`for {`
`52`	`52`	`c, err := iter.Next()`
`53`	`53`	`if err != nil {`
`54`		`- return nil, err`
	`54`	`+ xlog.Debug("No more messages to parse")`
	`55`	`+ break`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`if c.Hash.String() == fromHash.String() {`
`@@ -60,6 +61,7 @@ func getCommits(r *git.Repository, from, to string) ([]string, error) {`
`60`	`61`
`61`	`62`	`messages = append(messages, c.Message)`
`62`	`63`	`}`
	`64`	`+ xlog.Debugf("Got messages: %v", messages)`
`63`	`65`	`return messages, nil`
`64`	`66`	`}`
`65`	`67`