From 55a4e1d336db0dd0af70bf22df8ec3ae0b38644a Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Tue, 12 Apr 2022 18:34:32 +0300
Subject: [PATCH] CI: update os2.yml to use open-watcom/setup-watcom

also remove os2-buildbot.sh -- not needed anymore.
---
 .github/workflows/os2.yml     | 30 +++++++++++--------------
 build-scripts/os2-buildbot.sh | 41 -----------------------------------
 2 files changed, 13 insertions(+), 58 deletions(-)
 delete mode 100755 build-scripts/os2-buildbot.sh

diff --git a/.github/workflows/os2.yml b/.github/workflows/os2.yml
index c6f11e020..2ae10643b 100644
--- a/.github/workflows/os2.yml
+++ b/.github/workflows/os2.yml
@@ -7,20 +7,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
-      - name: Cache OpenWatcom
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-openwatcom
-        with:
-          path: ~/openwatcom
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-
-      - name: Download OpenWatcom if not cached
-        run: if [ ! -d ~/openwatcom/binl64 ]; then wget --no-verbose 'https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build/open-watcom-2_0-c-linux-x64' -O ~/ow.zip && mkdir -p ~/openwatcom && cd ~/openwatcom && unzip ~/ow.zip && chmod -R a+rx ~/openwatcom ; fi
-        shell: bash
-
-      - name: Build
-        run: WATCOM="$HOME/openwatcom" build-scripts/os2-buildbot.sh
-        shell: bash         
-
+      - uses: open-watcom/setup-watcom@v0
+      - name: Build SDL2
+        run: |
+          wmake -f Makefile.os2
+      - name: Build tests
+        run: |
+          cd test && wmake -f Makefile.os2
+          cd ..
+      - name: distclean
+        run: |
+          wmake -f Makefile.os2 distclean
+          cd test && wmake -f Makefile.os2 distclean
+          cd ..
diff --git a/build-scripts/os2-buildbot.sh b/build-scripts/os2-buildbot.sh
deleted file mode 100755
index abe0350d0..000000000
--- a/build-scripts/os2-buildbot.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# This is the script buildbot.libsdl.org uses to cross-compile SDL2 from
-#  x86 Linux to OS/2, using OpenWatcom.
-
-# The final zipfile can be unpacked on any machine that supports OpenWatcom
-#  (Windows, Linux, OS/2, etc). Point the compiler at the include directory
-#  and link against the SDL2.lib file. Ship the SDL2.dll with your app.
-
-if [ -z "$WATCOM" ]; then
-    echo "This script expects \$WATCOM to be set to the OpenWatcom install dir." 1>&2
-    echo "This is often something like '/usr/local/share/watcom'" 1>&2
-    exit 1
-fi
-export PATH="$WATCOM/binl64:$PATH"
-
-ZIPFILE="$1"
-if [ -z $1 ]; then
-    ZIPFILE=sdl-os2.zip
-fi
-ZIPDIR=buildbot/SDL
-
-set -e
-set -x
-
-cd `dirname "$0"`
-cd ..
-
-rm -f $ZIPFILE
-wmake -f Makefile.os2
-rm -rf $ZIPDIR
-mkdir -p $ZIPDIR
-chmod 644 SDL2.dll SDL2.lib SDL2test.lib
-mv SDL2.dll SDL2.lib SDL2test.lib $ZIPDIR/
-cp -R include $ZIPDIR/
-zip -9r "buildbot/$ZIPFILE" $ZIPDIR
-
-wmake -f Makefile.os2 distclean
-
-set +x
-echo "All done. Final installable is in $ZIPFILE ...";