Skip to content

Commit

Permalink
Merge pull request #1642 from flanksource/fix-lint-action
Browse files Browse the repository at this point in the history
chore: fix golang lint action
  • Loading branch information
moshloop authored Feb 1, 2024
2 parents 01c2daf + c03c09d commit b7d46d8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ jobs:
with:
go-version: 1.20.x
- name: golangci-lint
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
with:
version: v1.55.2
uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # v3.4.0
# Disable caching as a workaround for https://github.com/golangci/golangci-lint-action/issues/135.
# The line can be removed once the golangci-lint issue is resolved. version: v1.55.2
skip-pkg-cache: true

- name: setup node
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
Expand Down
8 changes: 3 additions & 5 deletions pkg/jobs/canary/canary_jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/flanksource/canary-checker/pkg/utils"
"github.com/flanksource/commons/logger"
"github.com/flanksource/duty/context"
"github.com/flanksource/duty/job"
dutyjob "github.com/flanksource/duty/job"
"github.com/flanksource/duty/models"
"go.opentelemetry.io/otel/trace"
Expand Down Expand Up @@ -151,7 +150,6 @@ func (j CanaryJob) Run(ctx dutyjob.JobRuntime) error {
if err := db.RemoveTransformedChecks(ctx.Context, checkIDsToRemove); err != nil {
ctx.Error(err, "error deleting transformed checks for canary")
}

}

// Update last runtime map
Expand All @@ -166,13 +164,13 @@ func logIfError(err error, description string) {
}
}

var CleanupDeletedCanaryChecks = &job.Job{
var CleanupDeletedCanaryChecks = &dutyjob.Job{
Name: "CleanupChecks",
Schedule: "@every 1h",
Singleton: true,
JobHistory: true,
Retention: job.RetentionDay,
Fn: func(ctx job.JobRuntime) error {
Retention: dutyjob.RetentionDay,
Fn: func(ctx dutyjob.JobRuntime) error {
var rows []struct {
ID string
}
Expand Down

0 comments on commit b7d46d8

Please sign in to comment.