Skip to content

Commit 791d927

Browse files
authored
fix: go-staticcheck: break loop were not positionned at the correct level (#301)
* fix: go-staticcheck: break loop were not positionned at the correct level * fix: bump dependencies for Dockerfile Signed-off-by: Romain Beuque <[email protected]>
1 parent c2d696f commit 791d927

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:latest AS js-builder
1+
FROM node:16 AS js-builder
22

33
RUN npm install -g @angular/cli
44
COPY ./ui /home/node/ui
@@ -11,7 +11,7 @@ RUN BASEHREF=___UTASK_DASHBOARD_BASEHREF___ PREFIX_API_BASE_URL=___UTASK_DASHBOA
1111
WORKDIR /home/node/ui/editor
1212
RUN BASEHREF=___UTASK_EDITOR_BASEHREF___ SENTRY_DSN=___UTASK_DASHBOARD_SENTRY_DSN___ make build-prod
1313

14-
FROM golang:1.16-buster
14+
FROM golang:1.17-buster
1515

1616
COPY . /go/src/github.com/ovh/utask
1717
WORKDIR /go/src/github.com/ovh/utask

engine/engine.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ func resolve(dbp zesty.DBProvider, res *resolution.Resolution, t *task.Task, sm
385385

386386
expectedMessages := runAvailableSteps(dbp, map[string]bool{}, res, t, stepChan, executedSteps, []string{}, wg, debugLogger)
387387

388+
forLoop:
388389
for expectedMessages > 0 {
389390
debugLogger.Debugf("Engine: resolve() %s loop, %d expected steps", res.PublicID, expectedMessages)
390391
select {
@@ -462,7 +463,7 @@ func resolve(dbp zesty.DBProvider, res *resolution.Resolution, t *task.Task, sm
462463
case <-gracePeriodEnd:
463464
// shutting down, time is up: exit the loop no matter how many steps might be pending
464465
expectedMessages = 0
465-
break
466+
break forLoop
466467
}
467468
}
468469

0 commit comments

Comments
 (0)