--wip-- [skip ci]

Author: GuillaumeLagrange

src/executor/orchestrator.rs

@@ -87,19 +87,25 @@ impl Orchestrator {
 
         // Phase 2: Upload all results
         if !config.skip_upload {
+            let mut last_upload_result: Option<UploadResult> = None;
             for (ctx, executor_name) in &mut completed_runs {
                 if !self.is_local() {
                     // OIDC tokens can expire quickly, so refresh just before each upload
                     self.provider.set_oidc_token(&mut ctx.config).await?;
                 }
 
                 start_group!("Uploading results");
-                let upload_result = crate::upload::upload(self, ctx, executor_name.clone()).await?;
+                last_upload_result =
+                    Some(crate::upload::upload(self, ctx, executor_name.clone()).await?);
+                end_group!();
+            }
 
-                if self.is_local() {
+            // Phase 3: Poll results after all uploads are complete.
+            // All uploads share the same run_id/owner/repository, so polling once is sufficient.
+            if self.is_local() {
+                if let Some(upload_result) = last_upload_result {
                     poll_results(&upload_result).await?;
                 }
-                end_group!();
             }
         } else {
             debug!("Skipping upload of performance data");