Skip to content

Commit

Permalink
[7.17] Update to go v1.18.8 Update deps to latest patch (#2101)
Browse files Browse the repository at this point in the history
* Update to go v1.18.8 Update deps to latest patch

* Update build docker from stretch to bullseye

* Update linter version

* Update github.com/pkg/sftp
  • Loading branch information
michel-laterman committed Nov 29, 2022
1 parent 4b18cd5 commit c7a2ca5
Show file tree
Hide file tree
Showing 9 changed files with 42,525 additions and 10,675 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: golangci/golangci-lint-action@v2
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.44.2
version: v1.45.2

# Give the job more time to execute.
args: --timeout=5m
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17.8
1.18.8
2 changes: 1 addition & 1 deletion Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG GO_VERSION
FROM golang:${GO_VERSION}-stretch
FROM golang:${GO_VERSION}-buster

RUN apt-get update && apt-get install -y zip

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ endif
PLATFORM_TARGETS=$(addprefix release-, $(PLATFORMS))
COMMIT=$(shell git rev-parse --short HEAD)
NOW=$(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
LDFLAGS=-w -s -X main.Version=${VERSION} -X main.Commit=${COMMIT} -X main.BuildTime=$(NOW)
LDFLAGS=-w -s -X main.Version=${VERSION} -X main.Commit=${COMMIT} -X main.BuildTime=$(NOW)
CMD_COLOR_ON=\033[32m\xE2\x9c\x93
CMD_COLOR_OFF=\033[0m

Expand Down Expand Up @@ -100,7 +100,7 @@ check-no-changes:

.PHONY: test
test: prepare-test-context ## - Run all tests
@./dev-tools/run_with_go_ver $(MAKE) test-unit
@./dev-tools/run_with_go_ver $(MAKE) test-unit
@./dev-tools/run_with_go_ver $(MAKE) test-int
@$(MAKE) junit-report

Expand All @@ -118,7 +118,7 @@ prepare-test-context: ## - Prepare the test context folders

.PHONY: junit-report
junit-report: ## - Run the junit-report generation for all the out files generated
@go get -v -u github.com/jstemmer/go-junit-report
@go install -v github.com/jstemmer/go-junit-report
$(foreach file, $(wildcard build/*.out), go-junit-report > "${file}.xml" < ${file};)

##################################################
Expand Down

0 comments on commit c7a2ca5

Please sign in to comment.