chore: Fix Windows and Mac CI

Author: leandromqrs

.github/workflows/release-appimage.yml

@@ -12,10 +12,32 @@ jobs:
   appimage:
     name: Build AppImage
     runs-on: ubuntu-latest
+    container:
+      image: fedora:latest
     outputs:
       artifact-name: ${{ steps.names.outputs.artifact_name }}
       appimage-name: ${{ steps.names.outputs.appimage_name }}
     steps:
+      - name: Install system dependencies
+        run: |
+          dnf install -y \
+            appstream \
+            curl \
+            desktop-file-utils \
+            file \
+            findutils \
+            gcc \
+            gcc-c++ \
+            git \
+            gtk4-devel \
+            gtksourceview5-devel \
+            libadwaita-devel \
+            make \
+            openssl-devel \
+            patchelf \
+            pkgconf-pkg-config \
+            vte291-gtk4-devel
+
       - name: Check out sources
         uses: actions/checkout@v4
 
@@ -47,43 +69,27 @@ jobs:
           echo "artifact_name=appimage-bundle" >> "$GITHUB_OUTPUT"
           echo "appimage_name=aetheris-${VERSION}-x86_64.AppImage" >> "$GITHUB_OUTPUT"
 
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            appstream \
-            curl \
-            desktop-file-utils \
-            file \
-            libadwaita-1-dev \
-            libgtk-4-dev \
-            libgtksourceview-5-dev \
-            libssl-dev \
-            libvte-2.91-gtk4-dev \
-            patchelf \
-            pkg-config
-
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
       - name: Install AppImage tooling
         run: |
           set -euo pipefail
           cargo install cargo-appimage
-          sudo mkdir -p /usr/local/share/appimagetool
-          sudo curl -fL \
+          mkdir -p /usr/local/share/appimagetool
+          curl -fL \
             "https://github.com/AppImage/appimagetool/releases/download/1.9.1/appimagetool-x86_64.AppImage" \
             -o /usr/local/bin/appimagetool-bin
-          sudo curl -fL \
+          curl -fL \
             "https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-x86_64" \
             -o /usr/local/share/appimagetool/runtime-x86_64
-          sudo chmod +x /usr/local/bin/appimagetool-bin /usr/local/share/appimagetool/runtime-x86_64
-          sudo tee /usr/local/bin/appimagetool >/dev/null <<'EOF'
+          chmod +x /usr/local/bin/appimagetool-bin /usr/local/share/appimagetool/runtime-x86_64
+          tee /usr/local/bin/appimagetool >/dev/null <<'EOF'
           #!/usr/bin/env bash
           set -euo pipefail
           exec /usr/local/bin/appimagetool-bin --runtime-file /usr/local/share/appimagetool/runtime-x86_64 "$@"
           EOF
-          sudo chmod +x /usr/local/bin/appimagetool
+          chmod +x /usr/local/bin/appimagetool
 
       - name: Build AppImage
         run: |

crates/aetheris-app/src/app/handler.rs

@@ -915,10 +915,7 @@ impl App {
                 self.feed_terminal_event(token, event);
             }
             AppMsg::PodExecFinished(token, result) => {
-                if let Some(session) = self.terminal_sessions.get_mut(&token) {
-                    session.abort_handle = None;
-                    session.input_tx = None;
-                }
+                self.finish_terminal_session(token);
                 if let Err(error) = result {
                     let message = terminal_error_message(&error);
                     self.show_terminal_error(token, &error);

crates/aetheris-app/src/app/streams.rs

@@ -509,6 +509,17 @@ impl App {
             .add_toast(adw::Toast::new(&terminal_error_message(error)));
     }
 
+    #[cfg(not(target_os = "windows"))]
+    pub(super) fn finish_terminal_session(&mut self, token: u64) {
+        if let Some(session) = self.terminal_sessions.get_mut(&token) {
+            session.abort_handle = None;
+            session.input_tx = None;
+        }
+    }
+
+    #[cfg(target_os = "windows")]
+    pub(super) fn finish_terminal_session(&mut self, _token: u64) {}
+
     #[cfg(not(target_os = "windows"))]
     pub(super) fn send_terminal_input(&self, token: u64, text: String) {
         if let Some(input_tx) = self

scripts/bundle-macos-runtime.sh

@@ -68,7 +68,6 @@ copy_dylib() {
 
 fix_binary() {
   local binary="$1"
-  local new_libs=()
   local rpath
   rpath="@loader_path/$(python3 -c 'import os, sys; print(os.path.relpath(sys.argv[1], os.path.dirname(sys.argv[2])))' "$frameworks" "$binary")"
 
@@ -84,7 +83,7 @@ fix_binary() {
 
     if [ -f "$src" ]; then
       if copy_dylib "$src"; then
-        new_libs+=("$frameworks/$name")
+        printf '%s\n' "$frameworks/$name"
       fi
       install_name_tool -change "$lib" "@rpath/$name" "$binary" 2>/dev/null || true
     fi
@@ -93,30 +92,41 @@ fix_binary() {
   if ! otool -l "$binary" 2>/dev/null | grep -q "$rpath"; then
     install_name_tool -add_rpath "$rpath" "$binary" 2>/dev/null || true
   fi
-
-  printf '%s\n' "${new_libs[@]}"
 }
 
 queue=()
+queue_count=0
 while IFS= read -r lib; do
-  [ -n "$lib" ] && queue+=("$lib")
+  if [ -n "$lib" ]; then
+    queue+=("$lib")
+    queue_count=$((queue_count + 1))
+  fi
 done < <(fix_binary "$main_binary")
 
 pass=0
-while [ "${#queue[@]}" -gt 0 ]; do
+while [ "$queue_count" -gt 0 ]; do
   pass=$((pass + 1))
   if [ "$pass" -gt 30 ]; then
     echo "Stopping dylib recursion after 30 passes." >&2
     break
   fi
 
   next=()
+  next_count=0
   for lib in "${queue[@]}"; do
     while IFS= read -r new_lib; do
-      [ -n "$new_lib" ] && next+=("$new_lib")
+      if [ -n "$new_lib" ]; then
+        next+=("$new_lib")
+        next_count=$((next_count + 1))
+      fi
     done < <(fix_binary "$lib")
   done
-  queue=("${next[@]}")
+  if [ "$next_count" -gt 0 ]; then
+    queue=("${next[@]}")
+  else
+    queue=()
+  fi
+  queue_count="$next_count"
 done
 
 copy_tree "$brew_prefix/share/glib-2.0/schemas" "$share/glib-2.0/schemas"