Improve macOS app test script reliability and error handling (#885)

* Improve macOS app test script reliability and error handling * Update actions/setup-python to v5 to resolve deprecation warnings
OpenAdaptAI · Oct 24, 2024 · c1075f1 · c1075f1
1 parent 99bbe0e
commit c1075f1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 37 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
           repository: ${{ env.REPO }}
 
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

diff --git a/.github/workflows/release-and-publish.yml b/.github/workflows/release-and-publish.yml
@@ -34,7 +34,7 @@ jobs:
           with:
               fetch-depth: 0
         - name: Set up Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: '3.10'
         - name: Install dependencies
@@ -73,7 +73,7 @@ jobs:
           with:
               fetch-depth: 0
         - name: Set up Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: '3.10'
         - name: Set up Node.js
@@ -184,7 +184,7 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.ADMIN_TOKEN }} # Use the new token for authentication
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install the latest version of the project
@@ -235,7 +235,7 @@ jobs:
         with:
           ref: main
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Publish to PyPI

diff --git a/build_scripts/test_app_run_macos.sh b/build_scripts/test_app_run_macos.sh
@@ -1,53 +1,41 @@
 #!/bin/bash
 
-# unzip the app
-
+# Unzip the app
 ZIPFILE_PATH="$(pwd)/dist/OpenAdapt.app.zip"
 unzip -o "$ZIPFILE_PATH" -d "$(pwd)/dist"
 
-APP_PATH="$(pwd)/dist/OpenAdapt.app/Contents/MacOS/OpenAdapt.app"
-
-# print current directory
+# Current directory for reference
 echo "Current directory: $(pwd)"
-echo "App path: $APP_PATH"
-
-# Run the app
-open "$APP_PATH"
 
-# Allow some time for the application to launch
-sleep 30
+# Path to the app
+APP_PATH="$(pwd)/dist/OpenAdapt.app"
+EXECUTABLE_PATH="$APP_PATH/Contents/MacOS/OpenAdapt"
+echo "App path: $APP_PATH"
+echo "Executable path: $EXECUTABLE_PATH"
 
-# Verify that the executable exists
-if [ -z "$APP_PATH" ]; then
-    echo "Error: Could not find executable in $APP_PATH"
+# Verify app exists
+if [ ! -d "$APP_PATH" ]; then
+    echo "Error: Could not find app at $APP_PATH"
     exit 1
 fi
 
-# Get the process IDs
-PIDS=$(pgrep -f "$APP_PATH")
-
-# Verify that the process IDs were found
-if [ -z "$PIDS" ]; then
-    echo "Error: Could not find process IDs for $APP_PATH"
+if [ ! -f "$EXECUTABLE_PATH" ]; then
+    echo "Error: Could not find executable at $EXECUTABLE_PATH"
     exit 1
 fi
 
-# Variable to track if any process is still running
-ALL_PROCESSES_RUNNING=true
+# Run the app
+open "$APP_PATH"
 
-# Check if the processes are still running
-for PID in $PIDS; do
-    if ! ps -p $PID > /dev/null; then
-        echo "Process $PID is not running"
-        ALL_PROCESSES_RUNNING=false
-        break
-    fi
-done
+# Wait for app to start
+sleep 30
 
-# Set the exit code variable based on the processes' status
-if [ "$ALL_PROCESSES_RUNNING" = true ]; then
+# Check for running process - try both the app name and binary name
+if pgrep -f "OpenAdapt" > /dev/null || pgrep -f "OpenAdapt.app" > /dev/null; then
+    echo "Process is running"
     EXIT_CODE=0
 else
+    echo "Error: Could not find process IDs for OpenAdapt"
     EXIT_CODE=1
 fi