revert mac to dw code

compmem · Nov 6, 2024 · 8b10137 · 8b10137
1 parent 9978461
commit 8b10137
Showing 1 changed file with 51 additions and 67 deletions.
diff --git a/.github/workflows/build_executables.yml b/.github/workflows/build_executables.yml
@@ -48,7 +48,10 @@ jobs:
               run: echo $SI > serverinfo.txt && echo $ULCRT > cert.pem
             - name: package cogmood
               shell: bash -l {0}
-              run: cd package && python -m PyInstaller cogmood_windows.spec
+              run: |
+                cd package 
+                export KIVY_GL_BACKEND=angle_sdl2
+                python -m PyInstaller cogmood_windows.spec
             - name: save exe
               uses: actions/upload-artifact@v3
               with:
@@ -86,70 +89,51 @@ jobs:
 #                  path: dist/SUPREME.exe # Path to your Windows executable
 
     build-macos:
-        runs-on: macos-13
+      runs-on: macos-14
         steps:
-            - name: Setup tmate session
-              uses: mxschmitt/action-tmate@v3
-              with:
-                detached: true
-              # if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
-            - uses: conda-incubator/setup-miniconda@v3
-              with:
-                miniconda-version: latest
-                auto-update-conda: true
-                activate-environment: kivy20
-                python-version: "3.10"
-                channels: conda-forge
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive # Initializes and updates submodules
-            - name: create env
-              shell: bash -l {0}
-              run: conda install -y kivy=2.3 pyinstaller=4.10 requests
-            - name: pip installs
-              shell: bash -l {0}
-              run: pip install pyo
-            - name: install smile
-              shell: bash -l {0}
-              run: pip install -e smile
-            - name: create files
-              shell: bash -l {0}
-              env:
-                SIMAC: ${{ secrets.SIMAC }}
-                ULCRTMAC: ${{ secrets.ULCRTMAC }}
-              run: echo "$SIMAC" > serverinfo.txt && echo "$ULCRTMAC" > cert.pem
-            - name: package cogmood
-              shell: bash -l {0}
-              run: cd package && python -m PyInstaller --noconfirm --target-arch universal2 cogmood_mac.spec
-            - name: save exe
-              uses: actions/upload-artifact@v3
-              with:
-                  name: SUPREME
-                  path: dist/SUPREME
-#            - name: Set up Python
-#              uses: actions/setup-python@v5
-#              with:
-#                  python-version: "3.10" # Specify your Python version
-#
-#            - name: Install Homebrew dependencies
-#              run: |
-#                  brew update
-#                  brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf
-#
-#            - name: Install dependencies
-#              run: |
-#                  python -m pip install --upgrade pip
-#                  pip install pyinstaller
-#                  pip install --target . --platform=macosx_10_9_universal2 --only-binary=:all: -r requirements.txt
-#
-#            - name: Build executable with PyInstaller
-#              run: |
-#                  cd package
-#                  pyinstaller --noconfirm --target-arch universal2 cogmood_mac.spec
-#
-#            - name: Upload macOS executable
-#              uses: actions/upload-artifact@v4
-#              with:
-#                  name: SUPREME
-#                  path: dist/SUPREME
+          - name: Setup tmate session
+            uses: mxschmitt/action-tmate@v3
+            with:
+              detached: true
+            # if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+
+          - name: Checkout code
+            uses: actions/checkout@v4
+            with:
+              submodules: recursive # Initializes and updates submodules
+
+          - name: Set up Python
+            uses: actions/setup-python@v5
+            with:
+              python-version: "3.10" # Specify your Python version
+
+          - name: Check if Python is a fat binary
+            run: |
+              if lipo -info $(which python3) | grep -q "Architectures in the fat file"; then
+                  lipo -info $(which python3)
+                  echo "Python is a fat binary."
+              else
+                  echo "Python is NOT a fat binary."
+                  exit 1  # Optional: Exit with error if you require a fat binary
+              fi
+
+          - name: Install Homebrew dependencies
+            run: |
+              brew update
+              brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf
+  
+          - name: Install dependencies
+            run: |
+              python -m pip install --upgrade pip
+              python -m pip install -r requirements.txt
+
+          - name: Build executable with PyInstaller
+            run: |
+              cd package
+              python -m pyinstaller --noconfirm cogmood_mac.spec
+
+          - name: Upload macOS executable
+            uses: actions/upload-artifact@v4
+            with:
+              name: SUPREME
+              path: dist/SUPREME