fix release

.github/workflows/build.yml

@@ -4,13 +4,14 @@ on:
   push:
     tags:
       - 'v*'
-
+    branches:
+      - main
 env:
   repo: ghcr.io/atonomic/scrapegoat
   context_path: .
   image: scrapegoat
   tag: 0.1.0
-  dockerfile_path: GoatFile
+  dockerfile_path: Dockerfile
 
 jobs:
   build-and-push:
@@ -26,7 +27,7 @@ jobs:
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        password: ${{ secrets.PACKAGES_TOKEN }}
 
     - name: Build and Push Docker Image
       run: |

.github/workflows/release.yml

@@ -5,8 +5,6 @@ on:
   push:
     tags:
       - 'v*'
-    branches:
-      - main
 
 env:
   RELEASE_TAG: "0.1.0"
@@ -80,10 +78,6 @@ jobs:
         run: |
           pipenv install --deploy --dev
 
-      - name: Install pefile (Windows)
-        if: matrix.os == 'windows-latest'
-        run: pipenv run pip install pefile
-
       - name: Cache Chrome Portable
         id: cache-chrome
         uses: actions/cache@v4

Pipfile

@@ -13,12 +13,14 @@ exceptiongroup = "*"
 filelock = "*"
 h11 = "*"
 idna = "*"
+macholib = {version = "*", markers = "sys_platform == 'darwin'"}
 outcome = "*"
+pefile = {version = "*", markers = "sys_platform == 'win32'"}
 pillow = "*"
 pipenv = "*"
 platformdirs = "*"
 PySocks = "*"
-pywin32-ctypes = "*"
+pywin32-ctypes = {version = "*", markers = "sys_platform == 'win32'"}
 requests = "*"
 selenium = "*"
 sniffio = "*"
@@ -31,8 +33,6 @@ urllib3 = "*"
 virtualenv = "*"
 websocket-client = "*"
 wsproto = "*"
-pefile = "*"
-macholib = "*"
 
 [dev-packages]
 

src/driver/selenium.py

@@ -2,8 +2,6 @@
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
-from selenium.webdriver.common.action_chains import ActionChains
-from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.chrome.service import Service
 from selenium.webdriver.chrome.options import Options
 from selenium.common.exceptions import WebDriverException, TimeoutException, NoSuchElementException, StaleElementReferenceException
@@ -102,7 +100,10 @@ def _get_chrome_service(self, options: Options) -> Service:
         if current_platform.startswith('win'):
             chrome_binary = 'chrome.exe'
             chromedriver_binary = 'chromedriver.exe'
-        elif current_platform.startswith('linux') or current_platform.startswith('darwin'):
+        elif current_platform.startswith('darwin'):
+            chrome_binary = 'Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'
+            chromedriver_binary = 'chromedriver'
+        else:
             chrome_binary = 'chrome'
             chromedriver_binary = 'chromedriver'