Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,31 @@ jobs:
mkdir "$GHOSTTY_SOURCE_DIR"
tar -xzf "$RUNNER_TEMP/ghostty.tar.gz" --strip-components=1 \
--directory "$GHOSTTY_SOURCE_DIR"
- name: Prefetch pinned Ghostty zlib
shell: bash
run: |
# Include zlib's lazy archive, without fetching the whole Ghostty graph
# or running build scripts. Zig verifies the existing manifest hash.
cd "$GHOSTTY_SOURCE_DIR/pkg/zlib"
log=$(mktemp)
trap 'rm -f "$log"' EXIT
for attempt in 1 2 3; do
if zig build --fetch=all --color off >"$log" 2>&1; then
cat "$log"
break
else
status=$?
fi
cat "$log" >&2
# Retry only the observed transient fetch timeout. Hash mismatches
# and other failures must remain immediately visible and fatal.
if [ "$attempt" -eq 3 ] \
|| ! grep -qE 'error: HTTP response read failure: Timeout$' "$log" \
|| grep 'error:' "$log" | grep -vE 'error: HTTP response read failure: Timeout$' >/dev/null; then
exit "$status"
fi
sleep 5
done
- name: Record toolchain
run: |
rustc --version
Expand Down
18 changes: 10 additions & 8 deletions crates/superplexr-desktop/src/app_menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ use crate::{
AboutSuperplexr, ActivateLastWorkspace, ActivateWorkspace1, ActivateWorkspace2,
ActivateWorkspace3, ActivateWorkspace4, ActivateWorkspace5, ActivateWorkspace6,
ActivateWorkspace7, ActivateWorkspace8, CloseActiveWorkspace, CopyTerminal, DecreaseAppZoom,
DuplicateWorkspace, HideApplication, HideOtherApplications, IncreaseAppZoom, MinimizeWindow,
NewSession, NewTerminal, NewWorkspace, NextSession, NextWorkspace, OpenGraphInspector,
OpenPluginManager, OpenProviderSettings, PasteTerminal, PreviousSession, PreviousWorkspace,
QuitApplication, ReloadTheme, RenameWorkspace, ResetAppZoom, RestoreClosedWorkspace,
ShowAllApplications, ToggleCommandDeck, ToggleFocusMode, ToggleFullScreen, ToggleSidebar,
ToggleWorkspacePin, UseGraphiteTheme, UsePaperTheme, ZoomWindow, theme::ThemeSelection,
DuplicateWorkspace, IncreaseAppZoom, MinimizeWindow, NewSession, NewTerminal, NewWorkspace,
NextSession, NextWorkspace, OpenGraphInspector, OpenPluginManager, OpenProviderSettings,
PasteTerminal, PreviousSession, PreviousWorkspace, QuitApplication, ReloadTheme,
RenameWorkspace, ResetAppZoom, RestoreClosedWorkspace, ToggleCommandDeck, ToggleFocusMode,
ToggleFullScreen, ToggleSidebar, ToggleWorkspacePin, UseGraphiteTheme, UsePaperTheme,
ZoomWindow, theme::ThemeSelection,
};
#[cfg(target_os = "macos")]
use crate::{HideApplication, HideOtherApplications, ShowAllApplications};

pub(crate) fn native_menus(theme: &ThemeSelection) -> Vec<Menu> {
vec![
Expand Down Expand Up @@ -105,7 +107,7 @@ pub(crate) fn native_menus(theme: &ThemeSelection) -> Vec<Menu> {
#[cfg(test)]
mod tests {
use super::*;
use gpui::{OwnedMenuItem, SystemMenuType};
use gpui::OwnedMenuItem;

#[test]
fn native_menu_exposes_the_complete_application_hierarchy() {
Expand Down Expand Up @@ -141,7 +143,7 @@ mod tests {
#[cfg(target_os = "macos")]
assert!(app_items.iter().any(|item| matches!(
item,
OwnedMenuItem::SystemMenu(menu) if menu.menu_type == SystemMenuType::Services
OwnedMenuItem::SystemMenu(menu) if menu.menu_type == gpui::SystemMenuType::Services
)));

let edit_items = &menus[2].items;
Expand Down
Loading