Skip to content

Commit 1d0ccf6

Browse files
Merge pull request #34 from salesforce/go-1.20
Go 1.20 and build updates
2 parents 3f32cac + f2fca9f commit 1d0ccf6

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v3
2424
with:
25-
go-version: 1.17
25+
go-version: '1.20'
2626
- name: Cache Go modules
2727
uses: actions/cache@v3
2828
with:

.github/workflows/golangci-lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
- uses: actions/checkout@v3.3.0
1313
- uses: actions/setup-go@v3
1414
with:
15-
go-version: '1.17'
15+
go-version: '1.20'
1616
- name: golangci-lint
1717
uses: golangci/golangci-lint-action@v3
1818
with:
19-
version: v1.29
19+
version: v1.51.2

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v3
2222
with:
23-
go-version: 1.17
23+
go-version: '1.20'
2424
- name: Cache Go modules
2525
uses: actions/cache@v3
2626
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
# Build / CI artifacts
55
/ci-result-to-slack
66
coverage.out
7+
/dist

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ORG_AND_REPO=salesforce/ci-results-to-slack
44
MOUNT_DIR=/go/src/github.com/${ORG_AND_REPO}
5-
BUILD_CONTAINER=golang:1.17-bullseye
5+
BUILD_CONTAINER=golang:1.20-bullseye
66
BINARY_NAME=ci-result-to-slack
77
ci: build test
88

@@ -23,11 +23,12 @@ lint:
2323

2424
clean:
2525
@echo "Cleaning..."
26-
rm -rf .$(BINARY_NAME)
26+
rm -rf $(BINARY_NAME)
2727
rm -rf coverage.out
2828

2929
local-docker-test: ## Build and run unit tests in docker container like CI without building the container
3030
docker run --rm=true -v `pwd`:$(MOUNT_DIR) $(BUILD_CONTAINER) bash -c 'cd $(MOUNT_DIR) && make ci'
3131

3232
local-docker-build: ## Build the container image
33+
docker run --rm=true -v `pwd`:$(MOUNT_DIR) $(BUILD_CONTAINER) bash -c 'cd $(MOUNT_DIR) && make build'
3334
docker build --no-cache -t $(ORG_AND_REPO) .

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/salesforce/ci-result-to-slack
22

3-
go 1.17
3+
go 1.20
44

55
require (
66
github.com/kelseyhightower/envconfig v1.4.0

0 commit comments

Comments
 (0)