Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove windows npm cache key
  • Loading branch information
kylecarbs committed Feb 5, 2022
commit a8a05316cd2248c9d8e70622124b821a154a72b0
1 change: 0 additions & 1 deletion .github/workflows/coder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ jobs:
path: |
~/.npm
%LocalAppData%\npm-cache
C:\npm
key: datadogci-
restore-keys: datadogci-

Expand Down
3 changes: 3 additions & 0 deletions provisionerd/provisionerd.go
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,9 @@ func (p *provisionerDaemon) cancelActiveJobf(format string, args ...interface{})
defer p.jobMutex.Unlock()
errMsg := fmt.Sprintf(format, args...)
if !p.isRunningJob() {
if p.isClosed() {
return
}
p.opts.Logger.Info(context.Background(), "skipping job cancel; none running", slog.F("error_message", errMsg))
return
}
Expand Down