From 39efaf13126f03dc0147c56d453ab6edf3e81bce Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sun, 27 Dec 2020 04:57:56 +0100
Subject: [PATCH] Add Linux mingw based builds

---
 .circleci/config.yml | 57 +++++---------------------------------
 .travis.yml          | 66 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 50 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2e82ccd82..c121c37cc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,65 +3,22 @@ jobs:
   diablo_109b:
     docker:
       - image: diasurgical/riivaaja:stable
-    working_directory: ~/repo
     steps:
       - checkout
       - run: make -f MakefileVC
-  diablo_109b_diff:
+  linux:
     docker:
-      - image: diasurgical/riivaaja:stable
-    environment:
-      MAKE_BUILD: pdb
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run: make -f MakefileVC
-      - run: wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-      - run: tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-      - run: mv comparer-config/diablo.toml comparer-config.toml
-      - run: ./devilution-comparer generate-full Diablo.exe --no-mem-disp --truncate-to-original
-      - run: ../status.sh
-      - run: .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Diablo 1.09b"
-  spawn_109b_diff:
-    docker:
-      - image: diasurgical/riivaaja:stable
-    environment:
-      MAKE_BUILD: pdb
-      SPAWN: 1
-    working_directory: ~/repo
+      - image: debian:stretch-backports
     steps:
       - checkout
-      - run: make -f MakefileVC
-      - run: wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-      - run: tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-      - run: mv comparer-config/spawn.toml comparer-config.toml
-      - run: ./devilution-comparer generate-full Diablo.exe --no-mem-disp --truncate-to-original
-      - run: ../spawn-status.sh
-      - run: .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Spawn 1.09b"
-  hellfire_101_diff:
-    docker:
-      - image: diasurgical/riivaaja:stable
-    environment:
-      MAKE_BUILD: pdb
-      HELLFIRE: 1
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run: make -f MakefileVC
-      - run: wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-      - run: tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-      - run: dd if=/dev/zero bs=1 count=3072 of=hellfire.exe
-      - run: dd if=Diablo.exe >> hellfire.exe
-      - run: mv comparer-config/hellfire.toml comparer-config.toml
-      - run: ./devilution-comparer generate-full hellfire.exe --no-mem-disp --truncate-to-original
-      - run: ../hellfire-status.sh
-      - run: .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Hellfire 1.01"
+      - run: apt-get update -y
+      - run: apt-get install -y mingw-w64
+      - run: make
+      - run: make debug
 
 workflows:
   version: 2
   testflow:
     jobs:
       - diablo_109b
-      - diablo_109b_diff
-      - spawn_109b_diff
-      - hellfire_101_diff
+      - linux
diff --git a/.travis.yml b/.travis.yml
index 43cfbbbba..ba90725ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,70 @@ script:
   - if [ $MAKE_BUILD = debug ]; then make debug; fi
 
 stages:
+  - Riivaaja
   - test
+
+jobs:
+  include:
+    - stage: Riivaaja
+      name: "Diablo 1.09b: Calculate binary accuracy"
+      language: minimal
+      sudo: required
+      services:
+        - docker
+      addons: {}
+      script:
+        - |
+          set -e
+          wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
+          tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
+          mv comparer-config/diablo.toml comparer-config.toml
+          echo '#!/bin/sh' | sudo tee /bin/wine
+          echo 'docker run -v $(pwd):/root/devilution --entrypoint "/usr/bin/wine" diasurgical/riivaaja:stable $(basename $1) $2 $3' | sudo tee --append /bin/wine
+          sudo chmod +x /bin/wine
+          docker run -v $(pwd):/root/devilution -e MAKE_BUILD=pdb diasurgical/riivaaja:stable
+          ./devilution-comparer generate-full Diablo.exe --no-mem-disp --truncate-to-original
+          docker run -v $(pwd):/root/devilution diasurgical/riivaaja:stable ../status.sh
+          .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Diablo 1.09b"
+    - stage: Riivaaja
+      name: "Spawn 1.09: Calculate binary accuracy"
+      language: minimal
+      sudo: required
+      services:
+        - docker
+      addons: {}
+      script:
+        - |
+          set -e
+          wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
+          tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
+          mv comparer-config/spawn.toml comparer-config.toml
+          echo '#!/bin/sh' | sudo tee /bin/wine
+          echo 'docker run -v $(pwd):/root/devilution --entrypoint "/usr/bin/wine" diasurgical/riivaaja:stable $(basename $1) $2 $3' | sudo tee --append /bin/wine
+          sudo chmod +x /bin/wine
+          docker run -v $(pwd):/root/devilution -e MAKE_BUILD=pdb -e SPAWN=1 diasurgical/riivaaja:stable
+          ./devilution-comparer generate-full Diablo.exe --no-mem-disp --truncate-to-original
+          docker run -v $(pwd):/root/devilution diasurgical/riivaaja:stable ../spawn-status.sh
+          .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Spawn 1.09b"
+    - stage: Riivaaja
+      name: "Hellfire 1.01: Calculate binary accuracy"
+      language: minimal
+      sudo: required
+      services:
+        - docker
+      addons: {}
+      script:
+        - |
+          set -e
+          wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
+          tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
+          mv comparer-config/hellfire.toml comparer-config.toml
+          echo '#!/bin/sh' | sudo tee /bin/wine
+          echo 'docker run -v $(pwd):/root/devilution --entrypoint "/usr/bin/wine" diasurgical/riivaaja:stable $(basename $1) $2 $3' | sudo tee --append /bin/wine
+          sudo chmod +x /bin/wine
+          docker run -v $(pwd):/root/devilution -e MAKE_BUILD=pdb -e HELLFIRE=1 diasurgical/riivaaja:stable
+          dd if=/dev/zero bs=1 count=3072 of=hellfire.exe
+          dd if=Diablo.exe >> hellfire.exe
+          ./devilution-comparer generate-full hellfire.exe --no-mem-disp --truncate-to-original
+          docker run -v $(pwd):/root/devilution diasurgical/riivaaja:stable ../hellfire-status.sh
+          .travis/are-we-d1-yet.sh "$(< accuracy.txt)" $DISCORD_WEBHOOK "Hellfire 1.01"