Skip to content

Commit d0daaa2

Browse files
authored
Merge branch 'v2' into job-runs-twice
2 parents 31b4eca + cf2f500 commit d0daaa2

File tree

11 files changed

+617
-251
lines changed

11 files changed

+617
-251
lines changed

.github/workflows/file_formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
uses: actions/checkout@v4
1717
- name: verify example_test.go
1818
run: |
19-
grep "^func " example_test.go | sort -c
19+
grep "^func [a-z-A-Z]" example_test.go | sort -c

.github/workflows/go_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
with:
2626
go-version: ${{ matrix.go-version }}
2727
- name: golangci-lint
28-
uses: golangci/golangci-lint-action@v6.1.1
28+
uses: golangci/golangci-lint-action@v6.2.0
2929
with:
3030
version: v1.59.1
3131
- name: test

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repos:
1212
- id: end-of-file-fixer
1313
- id: trailing-whitespace
1414
- repo: https://github.com/golangci/golangci-lint
15-
rev: v1.55.2
15+
rev: v1.61.0
1616
hooks:
1717
- id: golangci-lint
1818
- repo: https://github.com/TekWizely/pre-commit-golang

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fmt:
66
@go list -f {{.Dir}} ./... | xargs -I{} gofmt -w -s {}
77

88
lint:
9-
@grep "^func " example_test.go | sort -c
9+
@grep "^func [a-zA-Z]" example_test.go | sort -c
1010
@golangci-lint run
1111

1212
test:

errors.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var (
3939
ErrWeeklyJobMinutesSeconds = fmt.Errorf("gocron: WeeklyJob: atTimes minutes and seconds must be between 0 and 59 inclusive")
4040
ErrPanicRecovered = fmt.Errorf("gocron: panic recovered")
4141
ErrWithClockNil = fmt.Errorf("gocron: WithClock: clock must not be nil")
42+
ErrWithContextNil = fmt.Errorf("gocron: WithContext: context must not be nil")
4243
ErrWithDistributedElectorNil = fmt.Errorf("gocron: WithDistributedElector: elector must not be nil")
4344
ErrWithDistributedLockerNil = fmt.Errorf("gocron: WithDistributedLocker: locker must not be nil")
4445
ErrWithDistributedJobLockerNil = fmt.Errorf("gocron: WithDistributedJobLocker: locker must not be nil")

0 commit comments

Comments
 (0)