From 2b02f8c954585c9fbdf7018957f171f6b230c08b Mon Sep 17 00:00:00 2001
From: Russel Van Tuyl <russel.vantuyl@gmail.com>
Date: Thu, 14 Dec 2023 08:29:06 -0500
Subject: [PATCH] Updated GitHub action to check for latest version of Go

---
 .github/workflows/go.yml      |  1 +
 .github/workflows/release.yml |  1 +
 commands/exec_windows.go      |  2 +-
 core/core.go                  |  2 +-
 docs/CHANGELOG.MD             |  2 +-
 docs/ISSUE_TEMPLATE.md        | 12 +++++++-----
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index b898f3b..b95dfee 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -21,6 +21,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: '1.21'
+          check-latest: true
 
       - name: 'Build Merlin Agent'
         id: build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e24daab..73f1b27 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,6 +19,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: '1.21'
+          check-latest: true
 
       - name: Install 7zip
         id: install_7zip
diff --git a/commands/exec_windows.go b/commands/exec_windows.go
index 7aedc8b..9b9642b 100644
--- a/commands/exec_windows.go
+++ b/commands/exec_windows.go
@@ -668,7 +668,7 @@ func getProcess(name string, pid uint32) (string, uint32, error) {
 	}
 
 	snapshotHandle, err := syscall.CreateToolhelp32Snapshot(windows.TH32CS_SNAPPROCESS, 0)
-	if snapshotHandle < 0 || err != nil {
+	if int(snapshotHandle) < 0 || err != nil {
 		return "", 0, fmt.Errorf("there was an error creating the snapshot:\r\n%s", err)
 	}
 	defer syscall.CloseHandle(snapshotHandle)
diff --git a/core/core.go b/core/core.go
index ee7f78a..8ac821d 100644
--- a/core/core.go
+++ b/core/core.go
@@ -37,7 +37,7 @@ var Verbose = false
 var Debug = false
 
 // Version is the Merlin Agent's version number
-var Version = "2.0.0"
+var Version = "2.2.0"
 
 // Build is the build number of the Merlin Agent program set at compile time
 var Build = "nonRelease"
diff --git a/docs/CHANGELOG.MD b/docs/CHANGELOG.MD
index 8ed4e91..34c95a4 100644
--- a/docs/CHANGELOG.MD
+++ b/docs/CHANGELOG.MD
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 2.2.0 - 2023-12-09
+## 2.2.0 - 2023-12-14
 
 ### Added
 
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
index a0fdd17..ccf0696 100644
--- a/docs/ISSUE_TEMPLATE.md
+++ b/docs/ISSUE_TEMPLATE.md
@@ -5,17 +5,19 @@
 
 ### Environment Data
 
-* Merlin Version:
-* Merlin Build:
+* Merlin Agent Version:
+* Merlin Agent Build:
+* Operating System:
+
+If you're building from source, please provide the following information:
 * Go Version:
 * GOPATH Environment Variable:
 * GOROOT Environment Variable:
-* Operating System:
-
-### Expected Behavior
 
 ### Actual Behavior
 
+### Expected Behavior
+
 ### Steps to Reproduce Behavior
 
 ### Misc Information