From 4141a11c0f2702982de1aa7cbe56d9a65999bb06 Mon Sep 17 00:00:00 2001
From: Andrew Kroh <andrew.kroh@elastic.co>
Date: Fri, 15 Jan 2021 19:38:34 -0500
Subject: [PATCH] Update Go version to 1.16beta1

Add macOS arm64 example.
Add go1.16 to list of branches to test.
---
 .github/workflows/go.yml      |  5 +++--
 .github/workflows/release.yml |  4 ++--
 CHANGELOG.md                  |  5 +++++
 README.md                     | 13 +++++++++++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 80caa32..564d98a 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - 'go*'
     paths:
       - '**.go'
       - 'go.mod'
@@ -28,7 +29,7 @@ jobs:
       - name: set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.16beta1
 
       - name: check fmt
         run: find . -name '*.go' | xargs gofmt -l | read && echo "Code differs from gofmt's style. Run 'gofmt -w .'" 1>&2 && exit 1 || true
@@ -56,4 +57,4 @@ jobs:
               -output='build/bin/{{.Dir}}-{{.OS}}-{{.Arch}}' \
               -os='windows linux darwin freebsd' \
               -arch='amd64 386 arm arm64' \
-              -osarch='!darwin/386 !darwin/arm !darwin/arm64' ./cmd/gvm
+              -osarch='!darwin/386 !darwin/arm' ./cmd/gvm
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 99c4a4b..fe78241 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
       - name: set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.16beta1
 
       - name: install gox
         env:
@@ -35,7 +35,7 @@ jobs:
               -output='build/bin/{{.Dir}}-{{.OS}}-{{.Arch}}' \
               -os='windows linux darwin freebsd' \
               -arch='amd64 386 arm arm64' \
-              -osarch='!darwin/386 !darwin/arm !darwin/arm64' ./cmd/gvm
+              -osarch='!darwin/386 !darwin/arm' ./cmd/gvm
 
       - name: create draft release
         id: create_release
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 454ee9c..6200d46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+
+- Updated Go version used in building to 1.16.
+- Add an artifact for Apple M1 (darwin/arm64).
+
 ## [0.3.0]
 
 ### Added
diff --git a/README.md b/README.md
index 5f432a7..847bebe 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,7 @@ eval "$(gvm 1.15.6)"
 go version
 ```
 
-macOS:
-
+macOS (amd64):
 ``` bash
 # macOS Example
 curl -sL -o /usr/local/bin/gvm https://github.com/andrewkroh/gvm/releases/download/v0.3.0/gvm-darwin-amd64
@@ -47,6 +46,16 @@ eval "$(gvm 1.15.6)"
 go version
 ```
 
+macOS (arm64, aka M1):
+
+``` bash
+# macOS Example
+curl -sL -o /usr/local/bin/gvm https://github.com/andrewkroh/gvm/releases/download/v0.3.0/gvm-darwin-arm64
+chmod +x /usr/local/bin/gvm
+eval "$(gvm 1.15.6)"
+go version
+```
+
 Windows (Powershell):
 
 ```