Skip to content
Merged
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
10 changes: 8 additions & 2 deletions scripts/mac_bridge/install_autorecover_launchagent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set -euo pipefail

REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
RECOVER_SCRIPT="${REPO_ROOT}/scripts/mac_bridge/recover_runner_after_reboot.sh"
SUPPORT_DIR="${HOME}/Library/Application Support/Kakeya"
INSTALLED_RECOVER_SCRIPT="${SUPPORT_DIR}/recover_runner_after_reboot.sh"
LABEL="com.kakeya.mac-bridge-runner-autorecover"
UID_NUM="$(id -u)"
USER_NAME="$(id -un)"
Expand All @@ -20,6 +22,8 @@ fi

[ -x "$RECOVER_SCRIPT" ] || chmod +x "$RECOVER_SCRIPT"
mkdir -p "${HOME}/actions-runner/_diag"
mkdir -p "$SUPPORT_DIR"
install -m 755 "$RECOVER_SCRIPT" "$INSTALLED_RECOVER_SCRIPT"
TMP_PLIST="$(mktemp)"
trap 'rm -f "$TMP_PLIST"' EXIT

Expand All @@ -34,11 +38,11 @@ cat >"$TMP_PLIST" <<EOF
<key>ProgramArguments</key>
<array>
<string>/bin/bash</string>
<string>${RECOVER_SCRIPT}</string>
<string>${INSTALLED_RECOVER_SCRIPT}</string>
</array>

<key>WorkingDirectory</key>
<string>${REPO_ROOT}</string>
<string>${HOME}/actions-runner</string>

<key>EnvironmentVariables</key>
<dict>
Expand All @@ -48,6 +52,8 @@ cat >"$TMP_PLIST" <<EOF

<key>RunAtLoad</key>
<true/>
<key>AbandonProcessGroup</key>
<true/>
<key>KeepAlive</key>
<dict>
<key>SuccessfulExit</key><false/>
Expand Down
19 changes: 19 additions & 0 deletions tests/inference_engine/bridge/test_autorecover_installer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from pathlib import Path


ROOT = Path(__file__).resolve().parents[3]
INSTALLER = ROOT / "scripts" / "mac_bridge" / "install_autorecover_launchagent.sh"


def test_installer_uses_tcc_safe_support_directory():
source = INSTALLER.read_text()
assert 'SUPPORT_DIR="${HOME}/Library/Application Support/Kakeya"' in source
assert 'install -m 755 "$RECOVER_SCRIPT" "$INSTALLED_RECOVER_SCRIPT"' in source
assert "<string>${INSTALLED_RECOVER_SCRIPT}</string>" in source
assert "<string>${HOME}/actions-runner</string>" in source


def test_installer_preserves_direct_runner_child():
source = INSTALLER.read_text()
assert "<key>AbandonProcessGroup</key>" in source
assert "<true/>" in source
Loading