Skip to content

Commit

Permalink
Fix workspace resolution for non-server-side (#803)
Browse files Browse the repository at this point in the history
That's what you get for restructuring. Also thank you go for allowing shadowing so silently 🙃
  • Loading branch information
eseliger authored Jul 20, 2022
1 parent 4d5a398 commit 8db7dd7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ All notable changes to `src-cli` are documented in this file.

### Removed

## 3.42.1

### Fixed

- Fixed an issue where no workspaces would be executed on after successful workspace resolution.

## 3.42.0

### Changed
Expand Down
4 changes: 2 additions & 2 deletions cmd/src/batch_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
ui.DeterminingWorkspacesSuccess(len(workspaces))
} else {
ui.ResolvingRepositories()
repos, err := svc.ResolveRepositories(ctx, batchSpec, opts.flags.allowUnsupported, opts.flags.allowIgnored)
repos, err = svc.ResolveRepositories(ctx, batchSpec, opts.flags.allowUnsupported, opts.flags.allowIgnored)
if err != nil {
if repoSet, ok := err.(batches.UnsupportedRepoSet); ok {
ui.ResolvingRepositoriesDone(repos, repoSet, nil)
Expand All @@ -385,7 +385,7 @@ func executeBatchSpec(ctx context.Context, ui ui.ExecUI, opts executeBatchSpecOp
}

ui.DeterminingWorkspaces()
workspaces, err := svc.DetermineWorkspaces(ctx, repos, batchSpec)
workspaces, err = svc.DetermineWorkspaces(ctx, repos, batchSpec)
if err != nil {
return err
}
Expand Down

0 comments on commit 8db7dd7

Please sign in to comment.