From 8db7dd7c030b851b8fa2f52ca277c838e5c12abe Mon Sep 17 00:00:00 2001 From: Erik Seliger Date: Wed, 20 Jul 2022 12:09:25 +0200 Subject: [PATCH] Fix workspace resolution for non-server-side (#803) That's what you get for restructuring. Also thank you go for allowing shadowing so silently :upside_down_face: --- CHANGELOG.md | 6 ++++++ cmd/src/batch_common.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 923cb6c0cb..298c5854cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/cmd/src/batch_common.go b/cmd/src/batch_common.go index d4d95ab63c..553831adbd 100644 --- a/cmd/src/batch_common.go +++ b/cmd/src/batch_common.go @@ -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) @@ -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 }