From 739fbf35a70ec0067439a39183b6c40c60f01223 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Sat, 27 Aug 2022 21:22:28 +0800
Subject: [PATCH] ci test

---
 .github/workflows/pack.yml            |  2 +-
 .github/workflows/pack_linux.yml      | 19 ++++++++++++++++---
 .github/workflows/release_linux.yml   | 17 +++++++++++++++--
 .github/workflows/release_macos.yml   |  2 +-
 .github/workflows/release_windows.yml |  2 +-
 pack.py                               |  6 +++---
 6 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
index 996d4e1..d5ca711 100644
--- a/.github/workflows/pack.yml
+++ b/.github/workflows/pack.yml
@@ -38,6 +38,6 @@ jobs:
       - name: test pack
         run: |
           pip3 install -r requirements.txt
-          pip3 install pyinstaller wheel
+          pip3 install pyinstaller wheel pyinstaller-hooks-contrib
           python setup.py sdist bdist_wheel
           python pack.py
diff --git a/.github/workflows/pack_linux.yml b/.github/workflows/pack_linux.yml
index 59bc943..60e7c6c 100644
--- a/.github/workflows/pack_linux.yml
+++ b/.github/workflows/pack_linux.yml
@@ -40,8 +40,21 @@ jobs:
           python --version
           export QT_DEBUG_PLUGINS=1
           sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive sudo apt-get install -y x11-utils libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0 libegl1 libxcb-xinerama0
+          DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends \
+            xvfb \
+            x11-utils \
+            libxkbcommon-x11-0 \
+            libxcb-icccm4 \
+            libxcb-image0 \
+            libxcb-keysyms1 \
+            libxcb-randr0 \
+            libxcb-render-util0 \
+            libxcb-xkb1 \
+            libegl1-mesa \
+            libxcb-xinerama0 \
+            libglib2.0-0 \
+            libopengl0
           pip3 install -r requirements.txt
-          pip3 install -U pyinstaller wheel
+          pip3 install -U pyinstaller wheel pyinstaller-hooks-contrib
           python setup.py sdist bdist_wheel
-          python pack.py
+          xvfb-run python pack.py
diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml
index 4e39d10..ee18676 100644
--- a/.github/workflows/release_linux.yml
+++ b/.github/workflows/release_linux.yml
@@ -39,11 +39,24 @@ jobs:
           python --version
           export QT_DEBUG_PLUGINS=1
           sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive sudo apt-get install -y x11-utils libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0 libegl1 libxcb-xinerama0
+          DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends \
+            xvfb \
+            x11-utils \
+            libxkbcommon-x11-0 \
+            libxcb-icccm4 \
+            libxcb-image0 \
+            libxcb-keysyms1 \
+            libxcb-randr0 \
+            libxcb-render-util0 \
+            libxcb-xkb1 \
+            libegl1-mesa \
+            libxcb-xinerama0 \
+            libglib2.0-0 \
+            libopengl0
           pip3 install -r requirements.txt
           pip3 install pyinstaller wheel
           python setup.py sdist bdist_wheel
-          python pack.py
+          xvfb-run python pack.py
           release_path=`python pack.py ${{ matrix.os }}`
           echo $release_path
           release_name=`echo $release_path | awk -F"/" '{print $NF}'`
diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml
index 07f1b00..5c4a44f 100644
--- a/.github/workflows/release_macos.yml
+++ b/.github/workflows/release_macos.yml
@@ -38,7 +38,7 @@ jobs:
         run: |
           python --version
           pip3 install -r requirements.txt
-          pip3 install pyinstaller wheel
+          pip3 install pyinstaller wheel pyinstaller-hooks-contrib
           python setup.py sdist bdist_wheel
           python pack.py
           release_path=`python pack.py ${{ matrix.os }}`
diff --git a/.github/workflows/release_windows.yml b/.github/workflows/release_windows.yml
index 2ef8667..55866da 100644
--- a/.github/workflows/release_windows.yml
+++ b/.github/workflows/release_windows.yml
@@ -38,7 +38,7 @@ jobs:
         run: |
           python --version
           pip3 install -r requirements.txt
-          pip3 install pyinstaller wheel
+          pip3 install pyinstaller wheel pyinstaller-hooks-contrib
           python setup.py sdist bdist_wheel
           python pack.py
           $release_path = python pack.py ${{ matrix.os }}
diff --git a/pack.py b/pack.py
index 2f8650b..16528b8 100644
--- a/pack.py
+++ b/pack.py
@@ -12,9 +12,9 @@
 
 # when execute packed executable program(./dist/comtool) warning missing package, add here to resolve
 hidden_imports = [
-    "pyqtgraph.graphicsItems.PlotItem.plotConfigTemplate_pyqt5",
-    "pyqtgraph.graphicsItems.ViewBox.axisCtrlTemplate_pyqt5",
-    "pyqtgraph.imageview.ImageViewTemplate_pyqt5",
+    # "pyqtgraph.graphicsItems.PlotItem.plotConfigTemplate_pyqt5", # fixed in latest pyinstaller-hooks-contrib
+    # "pyqtgraph.graphicsItems.ViewBox.axisCtrlTemplate_pyqt5",
+    # "pyqtgraph.imageview.ImageViewTemplate_pyqt5",
     "babel.numbers"
 ]