attempt docker-wine

tstirrat · Jul 25, 2024 · 0c0e7f9 · 0c0e7f9
1 parent ffb1a6c
commit 0c0e7f9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,16 +28,20 @@ jobs:
           fileName: "gbdk-linux64.tar.gz"
           extract: true
           tarBall: true
-      - name: Install wine
+      # - name: Install wine
+      #   run: |
+      #     sudo dpkg --add-architecture i386
+      #     sudo mkdir -pm755 /etc/apt/keyrings
+      #     sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+      #     sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/winehq-jammy.sources
+      #     sudo apt update
+      #     sudo apt install --install-recommends winehq-stable
+      #   # sudo apt install -y winetricks
+      #   # sudo apt install -y winbind
+      - name: Install docker-wine
         run: |
-          sudo dpkg --add-architecture i386
-          sudo mkdir -pm755 /etc/apt/keyrings
-          sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
-          sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/winehq-jammy.sources
-          sudo apt update
-          sudo apt install --install-recommends winehq-stable
-        # sudo apt install -y winetricks
-        # sudo apt install -y winbind
+          wget https://raw.githubusercontent.com/scottyhardy/docker-wine/master/docker-wine
+          chmod +x docker-wine
       - uses: schmiddim/action-wget-unzip@v2
         with:
           url: "https://bgb.bircd.org/bgbw64.zip"

diff --git a/tests/bgb_get_snapshot.py b/tests/bgb_get_snapshot.py
@@ -42,7 +42,8 @@ def make_and_run(rom_relative):
     screenshot_path = rom_path_full.with_suffix('.bmp')
 
     subprocess.run([
-        "/usr/bin/env",
+        "../docker-wine",
+        "--rdp"
         "wine",
         "../bgb/bgb64.exe",
         "-set \"DebugSrcBrk=1\"",