Merge pull request #236 from 68cdrBxM8YdoJ/change-pyinstaller-add-data

Change to use dynamically fetched paths

.github/workflows/main.yml

@@ -32,32 +32,27 @@ jobs:
       run: |
         python number_parser.py -v
 
-#    - name: Show cloudsraper package location
+    - name: Set CLOUDSCRAPER_PATH variable
-#      run: |
+      run: |
-#        python -c 'import cloudscraper as _; print(_.__path__)'
+        echo "::set-env name=CLOUDSCRAPER_PATH::$(python -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1)"
 
     - name: Build with pyinstaller (windows)
       if: matrix.os == 'windows-latest'
       run: |
-        pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py --add-data='C:\\hostedtoolcache\\windows\\Python\\3.7.6\\x64\\lib\\site-packages\\cloudscraper\\;cloudscraper'
+        pyinstaller `
+          --onefile AV_Data_Capture.py `
+          --hidden-import ADC_function.py `
+          --hidden-import core.py `
+          --add-data "$env:CLOUDSCRAPER_PATH;cloudscraper"
 
-    - name: Build with pyinstaller (mac)
+    - name: Build with pyinstaller (mac/ubuntu)
-      if: matrix.os == 'macos-latest'
+      if: matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest'
       run: |
         pyinstaller \
           --onefile AV_Data_Capture.py \
           --hidden-import ADC_function.py \
           --hidden-import core.py \
-          --add-data='/Users/runner/hostedtoolcache/Python/3.7.6/x64/lib/python3.7/site-packages/cloudscraper/:cloudscraper'
+          --add-data "$CLOUDSCRAPER_PATH:cloudscraper"
-
-    - name: Build with pyinstaller (ubuntu)
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        pyinstaller \
-          --onefile AV_Data_Capture.py \
-          --hidden-import ADC_function.py \
-          --hidden-import core.py \
-          --add-data='/opt/hostedtoolcache/Python/3.7.6/x64/lib/python3.7/site-packages/cloudscraper/:cloudscraper'
 
     - name: Copy config.ini
       run: |