From 35037c18ed1710e46aecbd01b44c88748624b85f Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Sat, 23 May 2026 16:44:00 +0200 Subject: [PATCH 1/3] Make the Safari CI workflow use the local test server Co-authored-by: Claude noreply@anthropic.com Change-Id: I6ae979f4d1a6f2b1f3d0f8c2241d00c1e8d4c159 --- .github/workflows/safari.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/safari.yml b/.github/workflows/safari.yml index de277d619..e506a4111 100644 --- a/.github/workflows/safari.yml +++ b/.github/workflows/safari.yml @@ -44,12 +44,12 @@ jobs: run: ffmpeg -version - name: List all simulators run: xcrun xctrace list devices - #- name: Start local HTTP server - # run: (npm run start-server&) + - name: Start local HTTP server + run: (npm run start-server&) - name: Test Safari without video - run: ./bin/browsertime.js -b safari -n 1 https://www.sitespeed.io/ + run: ./bin/browsertime.js -b safari -n 1 http://127.0.0.1:3000/simple/ - name: Test Safari with video and Visual Metrics - run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600 --video --visualMetrics https://www.sitespeed.io/ + run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600 --video --visualMetrics http://127.0.0.1:3000/simple/ #- name: Test Safari iOS simulator # run: | # IPHONE14=$(xcrun xctrace list devices 2>&1 | grep -m 1 "iPhone 14 Simulator" | awk -F'[()]' '{print $4}') From e6bee7a6923e074b9193ad59c9da1808086a8098 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Sat, 23 May 2026 17:01:54 +0200 Subject: [PATCH 2/3] fix Change-Id: I41c5ddc9907c9f6abb74800deb14a99d5395c517 --- .github/workflows/mac-m1.yml | 15 ++++++++++++--- .github/workflows/safari.yml | 9 +++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mac-m1.yml b/.github/workflows/mac-m1.yml index a1c380d4f..78c3958b5 100644 --- a/.github/workflows/mac-m1.yml +++ b/.github/workflows/mac-m1.yml @@ -40,10 +40,19 @@ jobs: # run: system_profiler SPDisplaysDataType |grep Resolution - name: Enable Safaridriver run: sudo safaridriver --enable - #- name: Start local HTTP server - # run: (npm run start-server&) + - name: Start local HTTP server + run: (npm run start-server&) + - name: Safari environment diagnostics + run: | + sw_vers + echo "---" + /usr/bin/safaridriver --version + echo "---" + mdls -name kMDItemVersion /Applications/Safari.app || true + echo "---" + pgrep -lf safaridriver || echo "no safaridriver process" - name: Test Safari without video - run: ./bin/browsertime.js -b safari -n 1 https://www.sitespeed.io/ + run: ./bin/browsertime.js -b safari -n 1 http://127.0.0.1:3000/simple/ #- name: Test Safari with video and Visual Metrics # run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600 --video --visualMetrics https://www.sitespeed.io/ #- name: Test Safari iOS simulator diff --git a/.github/workflows/safari.yml b/.github/workflows/safari.yml index e506a4111..6dc3ffd6f 100644 --- a/.github/workflows/safari.yml +++ b/.github/workflows/safari.yml @@ -46,6 +46,15 @@ jobs: run: xcrun xctrace list devices - name: Start local HTTP server run: (npm run start-server&) + - name: Safari environment diagnostics + run: | + sw_vers + echo "---" + /usr/bin/safaridriver --version + echo "---" + mdls -name kMDItemVersion /Applications/Safari.app || true + echo "---" + pgrep -lf safaridriver || echo "no safaridriver process" - name: Test Safari without video run: ./bin/browsertime.js -b safari -n 1 http://127.0.0.1:3000/simple/ - name: Test Safari with video and Visual Metrics From 2dd8fd41ca092834b4dfd5dae41f9001386af9a3 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Sat, 23 May 2026 17:30:18 +0200 Subject: [PATCH 3/3] test Change-Id: I39bfbf8a6f1b0a9ffe66d08d65d93fa0b5daf80e --- .github/workflows/mac-m1.yml | 2 +- .github/workflows/safari.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac-m1.yml b/.github/workflows/mac-m1.yml index 78c3958b5..93938f060 100644 --- a/.github/workflows/mac-m1.yml +++ b/.github/workflows/mac-m1.yml @@ -8,7 +8,7 @@ on: - main jobs: build: - runs-on: macos-latest + runs-on: macos-14 timeout-minutes: 20 steps: - name: Harden Runner diff --git a/.github/workflows/safari.yml b/.github/workflows/safari.yml index 6dc3ffd6f..682d06862 100644 --- a/.github/workflows/safari.yml +++ b/.github/workflows/safari.yml @@ -8,7 +8,7 @@ on: - main jobs: build: - runs-on: macos-latest + runs-on: macos-14 timeout-minutes: 20 steps: - name: Harden Runner