Skip to content

Commit 76dcd83

Browse files
committed
fix: clear v0.26.4 release rerun blockers
1 parent 2a20757 commit 76dcd83

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

.github/workflows/release.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,10 @@ jobs:
295295
done
296296
done
297297
298+
if [[ "${{ matrix.platform }}" == "mac" && "${{ matrix.arch }}" == "x64" && -f release-publish/latest-mac.yml ]]; then
299+
mv release-publish/latest-mac.yml release-publish/latest-mac-x64.yml
300+
fi
301+
298302
- name: Upload desktop artifact bundle
299303
uses: actions/upload-artifact@v7
300304
with:
@@ -399,11 +403,12 @@ jobs:
399403
path: release-assets
400404

401405
- name: Merge macOS updater manifests
402-
run: >
403-
node scripts/merge-mac-update-manifests.ts
404-
release-assets/latest-mac.yml
405-
release-assets/latest-mac-x64.yml
406-
release-assets/latest-mac.yml
406+
run: |
407+
node scripts/merge-mac-update-manifests.ts \
408+
release-assets/latest-mac.yml \
409+
release-assets/latest-mac-x64.yml \
410+
release-assets/latest-mac.yml
411+
rm release-assets/latest-mac-x64.yml
407412
408413
- name: Stage release documentation
409414
env:

apps/web/src/components/ChatView.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4917,8 +4917,11 @@ export default function ChatView({
49174917
const isFullscreenPreviewMode = Boolean(
49184918
previewOpen && activeProject && previewLayoutMode === "fullscreen",
49194919
);
4920+
const activeWorkElapsed = activeWorkStartedAt ? formatElapsed(activeWorkStartedAt, nowIso) : null;
49204921
const floatingComposerStatus = isTurnActive
4921-
? `Working for ${formatElapsed(activeWorkStartedAt, nowIso)}`
4922+
? activeWorkElapsed
4923+
? `Working for ${activeWorkElapsed}`
4924+
: "Working"
49224925
: showPlanFollowUpPrompt && activeProposedPlan
49234926
? "Plan ready for follow-up"
49244927
: phase === "disconnected"

0 commit comments

Comments
 (0)