Merge f352055 into f11dbef

NationalLibraryOfNorway · Aug 7, 2024 · ac43dee · ac43dee
2 parents f11dbef + f352055
commit ac43dee
Show file tree

Hide file tree

Showing 10 changed files with 1,139 additions and 657 deletions.
diff --git a/.github/workflows/Build&Release.yml b/.github/workflows/Build&Release.yml
@@ -51,8 +51,15 @@ jobs:
           libxcb-keysyms1 \
           libxcb-icccm4 \
           libxcb-render-util0 \
-          libxkbcommon-x11-0
-
+          libxkbcommon-x11-0 \
+          gcc-10 \
+          g++-10 \
+          libstdc++6
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
+        sudo update-alternatives --set gcc /usr/bin/gcc-10
+        sudo update-alternatives --set g++ /usr/bin/g++-10
+      
     - name: Extract FFmpeg (Windows)
       if: matrix.os == 'windows-latest'
       run: |
@@ -67,6 +74,11 @@ jobs:
       if: matrix.os == 'windows-latest'
       run: |
         pyrcc5 resources/resources.qrc -o resources/resources_rc.py
+        
+    - name: Generate resources_rc.py (Linux)
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        pyrcc5 resources/resources.qrc -o resources/resources_rc.py
 
     - name: Build with PyInstaller (Windows)
       if: matrix.os == 'windows-latest'
@@ -78,7 +90,7 @@ jobs:
     - name: Build with PyInstaller (Linux)
       if: matrix.os == 'ubuntu-latest'
       run: |
-        pyinstaller --onefile Smelt.py # Use direct command for Linux build
+        pyinstaller resources/Smelt.spec  # Use the spec file
         ls -al dist  # List contents of dist directory for debugging
 
     - name: Set executable permission and create tarball for Linux artifact