Merge branch 'main' into firefox-basic-auth

sitespeedio · Mar 11, 2024 · 32d6dc2 · 32d6dc2
2 parents 1a3ce30 + 906885a
commit 32d6dc2
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 6 deletions.
diff --git a/.github/workflows/mac-m1.yml b/.github/workflows/mac-m1.yml
@@ -0,0 +1,51 @@
+name: OSX Safari Mac M1
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
+jobs:
+  build:
+    runs-on: macos-14
+    timeout-minutes: 20
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20.x'
+    - name: Use Pyhton
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12' 
+    - name: Install browsertime
+      run: npm ci
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade --user pip
+        python -m pip install --upgrade --user setuptools 
+        python -m pip install --user pyssim OpenCV-Python Numpy
+        python -m pip --version
+        python -m pip show Pillow
+        python -m pip show pyssim
+    #- name: Check resolution
+    #  run: system_profiler SPDisplaysDataType |grep Resolution
+    - name: Enable Safaridriver
+      run: sudo safaridriver --enable
+    #- 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/
+    #- 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 
+    #  run: |
+    #    IPHONE14=$(xcrun xctrace list devices  2>&1  | grep -m 1 "iPhone 14 Simulator" | awk -F'[()]' '{print $4}')
+    #    xcrun simctl boot $IPHONE14
+    #    echo "Booted $IPHONE14"
+    #    ./bin/browsertime.js -b safari -n 1 --safari.useSimulator --video --visualMetrics --safari.deviceUDID $IPHONE14 https://www.sitespeed.io/
+
+    #- name: Test Safari with video and Visual Metrics for multi pages
+    #  run: ./bin/browsertime.js -b safari -n 1 --viewPort 800x600  --video --visualMetrics test/data/navigationscript/multiMac.cjs
diff --git a/.github/workflows/safari.yml b/.github/workflows/safari.yml
@@ -16,19 +16,27 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: '20.x'
+    - name: Use Pyhton
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12' 
+    - name: Install FFMPEG
+      uses: FedericoCarboni/setup-ffmpeg@v3
+      id: setup-ffmpeg
+      ffmpeg-version: 5.1.4
     - name: Install browsertime
       run: npm ci
-    - name: Install dependencies
+    - name: Install Python dependencies
       run: |
-        sudo safaridriver --enable
-        brew update
-        brew install ffmpeg
         python -m pip install --upgrade --user pip
         python -m pip install --upgrade --user setuptools 
         python -m pip install --user pyssim OpenCV-Python Numpy
         python -m pip --version
         python -m pip show Pillow
         python -m pip show pyssim
+    - name: Checks
+      run: |
+        sudo safaridriver --enable      
         system_profiler SPDisplaysDataType |grep Resolution
         ffmpeg -version
     - name: List all simulators
@@ -37,8 +45,8 @@ jobs:
     # run: (npm run start-server&)
     - name: Test Safari without video 
       run: ./bin/browsertime.js -b safari -n 1 https://www.sitespeed.io/
-    #- 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 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 
     #  run: |
     #    IPHONE14=$(xcrun xctrace list devices  2>&1  | grep -m 1 "iPhone 14 Simulator" | awk -F'[()]' '{print $4}')