Skip to content

Commit

Permalink
Merge pull request #34 from salesforce/go-1.20
Browse files Browse the repository at this point in the history
Go 1.20 and build updates
  • Loading branch information
justinharringa authored Mar 5, 2023
2 parents 3f32cac + f2fca9f commit 1d0ccf6
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: '1.20'
- name: Cache Go modules
uses: actions/cache@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
- uses: actions/[email protected]
- uses: actions/setup-go@v3
with:
go-version: '1.17'
go-version: '1.20'
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.29
version: v1.51.2
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: '1.20'
- name: Cache Go modules
uses: actions/cache@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
# Build / CI artifacts
/ci-result-to-slack
coverage.out
/dist
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

Expand All @@ -23,11 +23,12 @@ lint:

clean:
@echo "Cleaning..."
rm -rf .$(BINARY_NAME)
rm -rf $(BINARY_NAME)
rm -rf coverage.out

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

local-docker-build: ## Build the container image
docker run --rm=true -v `pwd`:$(MOUNT_DIR) $(BUILD_CONTAINER) bash -c 'cd $(MOUNT_DIR) && make build'
docker build --no-cache -t $(ORG_AND_REPO) .
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/salesforce/ci-result-to-slack

go 1.17
go 1.20

require (
github.com/kelseyhightower/envconfig v1.4.0
Expand Down

0 comments on commit 1d0ccf6

Please sign in to comment.