diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69859d4..3a0fd8f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + include: + - os: ubuntu-22.04 + platform: linux + python-version: "3.11" + - os: windows-latest + platform: windows + python-version: "3.11" steps: - name: Check-out repository @@ -35,58 +41,78 @@ jobs: disable-plugins: tk-inter,dill-compat,eventlet,gevent,pyqt5,pyqt6,pyside2,pyside6,delvewheel,pywebview,matplotlib,spacy,enum-compat,pbr-compat,gevent,pmw-freezer,transformers,upx,kivy,options-nanny,multiprocessing,gi include-data-dir: assets=assets include-data-files: CREDITS=CREDITS - mode: standalone + mode: onefile output-file: GameOfLife - - name: Zip Build Output - shell: bash + - name: Locate and rename executable (Linux) + if: matrix.os == 'ubuntu-22.04' run: | - mkdir -p zip_output - if [ "${{ runner.os }}" = "Windows" ]; then - powershell.exe -Command "Compress-Archive -Path 'build/run.dist/*' -DestinationPath 'zip_output/GameOfLife-${{ runner.os }}.zip'" - else - cd build/run.dist - zip -r "../../zip_output/GameOfLife-${{ runner.os }}.zip" . + set -euo pipefail + echo "Searching for built Linux binary..." + # List to help debugging when paths change + ls -laR . | head -n 500 || true + BIN=$(find . -maxdepth 4 -type f -name 'GameOfLife*' -perm -u+x | head -n1 || true) + if [ -z "${BIN}" ]; then + echo "ERROR: No Linux binary found after build" + exit 1 fi + echo "Found: ${BIN}" + mkdir -p build_output + cp "${BIN}" build_output/GameOfLife.bin + chmod +x build_output/GameOfLife.bin + echo "Executable ready: build_output/GameOfLife.bin" + shell: bash - - name: Upload Zipped Build Artifact + - name: Locate and rename executable (Windows) + if: matrix.os == 'windows-latest' + run: | + Write-Host "Searching for built Windows binary..." + Get-ChildItem -Recurse -File -Filter 'GameOfLife*.exe' | Select-Object -First 1 | ForEach-Object { + Write-Host ("Found: " + $_.FullName) + New-Item -ItemType Directory -Force -Path build_output | Out-Null + Copy-Item $_.FullName "build_output\GameOfLife.exe" + Write-Host "Executable ready: build_output\GameOfLife.exe" + } + if (!(Test-Path build_output\GameOfLife.exe)) { + Write-Error "ERROR: No Windows binary found after build" + exit 1 + } + shell: pwsh + + - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: GameOfLife-${{ runner.os }}.zip - path: zip_output/GameOfLife-${{ runner.os }}.zip + name: ${{ matrix.platform }} + path: build_output/GameOfLife.* + release: - name: Create GitHub Release - needs: build runs-on: ubuntu-latest + needs: build steps: - name: Checkout repository uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download All Zipped Builds + - name: Download All Build Artifacts uses: actions/download-artifact@v4 with: path: downloads - - name: Delete Old Release (if exists) - continue-on-error: true - run: gh release delete latest -y + - name: Create release (if missing) and upload artifacts to tag env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Delete Git tag (if exists) - continue-on-error: true run: | - git push origin :refs/tags/latest - git tag -d latest - - - name: Recreate Git tag at HEAD - run: | - git tag latest - git push origin latest - - - name: Create the new release - run: gh release create latest downloads/**/GameOfLife-*.zip --title "Latest Build" --notes "Most recent multi-platform builds of Game Of Life" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + set -euo pipefail + TAG="${{ github.ref_name }}" + echo "Target release tag: $TAG" + if gh release view "$TAG" >/dev/null 2>&1; then + echo "Release $TAG already exists; will upload assets with --clobber" + else + gh release create "$TAG" \ + --title "$TAG" \ + --notes "Automated build for $TAG" + fi + # Upload the executables directly (no zip files) + gh release upload "$TAG" downloads/linux/GameOfLife.bin --clobber + gh release upload "$TAG" downloads/windows/GameOfLife.exe --clobber diff --git a/game/play.py b/game/play.py index 8ae0011..0adaa5c 100644 --- a/game/play.py +++ b/game/play.py @@ -76,7 +76,8 @@ class Game(arcade.gui.UIView): self.save_button.on_click = lambda event: self.save() self.anchor.add(self.save_button, anchor_x="right", anchor_y="bottom", align_x=-5, align_y=5) - if self.window.get_controllers(): + # Check if window has controller support (ControllerWindow has get_controllers, regular Window doesn't) + if hasattr(self.window, 'get_controllers') and self.window.get_controllers(): self.spritelist = arcade.SpriteList() self.cursor_sprite = arcade.Sprite(cursor_texture) self.spritelist.append(self.cursor_sprite) diff --git a/run.py b/run.py index 65854f4..8b59a05 100644 --- a/run.py +++ b/run.py @@ -1,8 +1,15 @@ import pyglet +pyglet.options['shadow_window'] = False # Fix double window issue on Wayland pyglet.options.debug_gl = False -import logging, datetime, os, json, sys, arcade +import logging, datetime, os, json, sys, arcade, platform + +# Set up paths BEFORE importing modules that load assets +script_dir = os.path.dirname(os.path.abspath(__file__)) +pyglet.resource.path.append(script_dir) +pyglet.font.add_directory(os.path.join(script_dir, 'assets', 'fonts')) + from utils.utils import get_closest_resolution, print_debug_info, on_exception from utils.constants import log_dir, menu_background_color @@ -12,9 +19,6 @@ from arcade.experimental.controller_window import ControllerWindow sys.excepthook = on_exception -pyglet.resource.path.append(os.getcwd()) -pyglet.font.add_directory('./assets/fonts') - __builtins__.print = lambda *args, **kwargs: logging.debug(" ".join(map(str, args))) if not log_dir in os.listdir(): @@ -44,6 +48,13 @@ if os.path.exists('settings.json'): else: antialiasing = 0 + # Wayland workaround (can be overridden with environment variable) + if (platform.system() == "Linux" and + os.environ.get("WAYLAND_DISPLAY") and + not os.environ.get("ARCADE_FORCE_MSAA")): + logging.info("Wayland detected - disabling MSAA (set ARCADE_FORCE_MSAA=1 to override)") + antialiasing = 0 + fullscreen = settings['window_mode'] == 'Fullscreen' style = arcade.Window.WINDOW_STYLE_BORDERLESS if settings['window_mode'] == 'borderless' else arcade.Window.WINDOW_STYLE_DEFAULT vsync = settings['vsync'] @@ -51,6 +62,14 @@ if os.path.exists('settings.json'): else: resolution = get_closest_resolution() antialiasing = 4 + + # Wayland workaround (can be overridden with environment variable) + if (platform.system() == "Linux" and + os.environ.get("WAYLAND_DISPLAY") and + not os.environ.get("ARCADE_FORCE_MSAA")): + logging.info("Wayland detected - disabling MSAA (set ARCADE_FORCE_MSAA=1 to override)") + antialiasing = 0 + fullscreen = False style = arcade.Window.WINDOW_STYLE_DEFAULT vsync = True @@ -73,8 +92,12 @@ else: if settings.get("music", True): theme_sound.play(volume=settings.get("music_volume", 50) / 100, loop=True) -window = ControllerWindow(width=resolution[0], height=resolution[1], title='Game Of Life', samples=antialiasing, antialiasing=antialiasing > 0, fullscreen=fullscreen, vsync=vsync, resizable=False, style=style) - +try: + window = ControllerWindow(width=resolution[0], height=resolution[1], title='Game Of Life', samples=antialiasing, antialiasing=antialiasing > 0, fullscreen=fullscreen, vsync=vsync, resizable=False, style=style, visible=False) +except (FileNotFoundError, PermissionError) as e: + logging.warning(f"Controller support unavailable: {e}. Falling back to regular window.") + window = arcade.Window(width=resolution[0], height=resolution[1], title='Game Of Life', samples=antialiasing, antialiasing=antialiasing > 0, fullscreen=fullscreen, vsync=vsync, resizable=False, style=style, visible=False) + if vsync: window.set_vsync(True) display_mode = window.display.get_default_screen().get_mode() @@ -98,6 +121,9 @@ main = Main() window.show_view(main) +# Make window visible after all setup is complete (helps prevent double window on Wayland) +window.set_visible(True) + logging.debug('Game started.') arcade.run() diff --git a/utils/preload.py b/utils/preload.py index 094e5dd..1d75a38 100644 --- a/utils/preload.py +++ b/utils/preload.py @@ -1,9 +1,14 @@ import arcade.gui, arcade +import os -button_texture = arcade.gui.NinePatchTexture(64 // 4, 64 // 4, 64 // 4, 64 // 4, arcade.load_texture("assets/graphics/button.png")) -button_hovered_texture = arcade.gui.NinePatchTexture(64 // 4, 64 // 4, 64 // 4, 64 // 4, arcade.load_texture("assets/graphics/button_hovered.png")) -cursor_texture = arcade.load_texture("assets/graphics/cursor.png") +# Get the directory where this module is located +_module_dir = os.path.dirname(os.path.abspath(__file__)) +_assets_dir = os.path.join(os.path.dirname(_module_dir), 'assets') -create_sound = arcade.Sound("assets/sound/create.mp3") -destroy_sound = arcade.Sound("assets/sound/destroy.mp3") -theme_sound = arcade.Sound("assets/sound/music.mp3") \ No newline at end of file +button_texture = arcade.gui.NinePatchTexture(64 // 4, 64 // 4, 64 // 4, 64 // 4, arcade.load_texture(os.path.join(_assets_dir, 'graphics', 'button.png'))) +button_hovered_texture = arcade.gui.NinePatchTexture(64 // 4, 64 // 4, 64 // 4, 64 // 4, arcade.load_texture(os.path.join(_assets_dir, 'graphics', 'button_hovered.png'))) +cursor_texture = arcade.load_texture(os.path.join(_assets_dir, 'graphics', 'cursor.png')) + +create_sound = arcade.Sound(os.path.join(_assets_dir, 'sound', 'create.mp3')) +destroy_sound = arcade.Sound(os.path.join(_assets_dir, 'sound', 'destroy.mp3')) +theme_sound = arcade.Sound(os.path.join(_assets_dir, 'sound', 'music.mp3')) \ No newline at end of file