Skip to content

Commit 2b02f8c

Browse files
committed
Updated GitHub action to check for latest version of Go
1 parent 4b8f253 commit 2b02f8c

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
uses: actions/setup-go@v4
2222
with:
2323
go-version: '1.21'
24+
check-latest: true
2425

2526
- name: 'Build Merlin Agent'
2627
id: build

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
uses: actions/setup-go@v4
2020
with:
2121
go-version: '1.21'
22+
check-latest: true
2223

2324
- name: Install 7zip
2425
id: install_7zip

commands/exec_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ func getProcess(name string, pid uint32) (string, uint32, error) {
668668
}
669669

670670
snapshotHandle, err := syscall.CreateToolhelp32Snapshot(windows.TH32CS_SNAPPROCESS, 0)
671-
if snapshotHandle < 0 || err != nil {
671+
if int(snapshotHandle) < 0 || err != nil {
672672
return "", 0, fmt.Errorf("there was an error creating the snapshot:\r\n%s", err)
673673
}
674674
defer syscall.CloseHandle(snapshotHandle)

core/core.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var Verbose = false
3737
var Debug = false
3838

3939
// Version is the Merlin Agent's version number
40-
var Version = "2.0.0"
40+
var Version = "2.2.0"
4141

4242
// Build is the build number of the Merlin Agent program set at compile time
4343
var Build = "nonRelease"

docs/CHANGELOG.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7-
## 2.2.0 - 2023-12-09
7+
## 2.2.0 - 2023-12-14
88

99
### Added
1010

docs/ISSUE_TEMPLATE.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@
55

66
### Environment Data
77

8-
* Merlin Version:
9-
* Merlin Build:
8+
* Merlin Agent Version:
9+
* Merlin Agent Build:
10+
* Operating System:
11+
12+
If you're building from source, please provide the following information:
1013
* Go Version:
1114
* GOPATH Environment Variable:
1215
* GOROOT Environment Variable:
13-
* Operating System:
14-
15-
### Expected Behavior
1616

1717
### Actual Behavior
1818

19+
### Expected Behavior
20+
1921
### Steps to Reproduce Behavior
2022

2123
### Misc Information

0 commit comments

Comments
 (0)