From 26256f0546199d3bc7596eac6a9f05c4096980ec Mon Sep 17 00:00:00 2001
From: AKuHAK <621640+AKuHAK@users.noreply.github.com>
Date: Sun, 20 Jun 2021 23:30:20 +0300
Subject: [PATCH] Fixed debug builds

---
 .github/workflows/check-format.yml      |  3 +-
 .github/workflows/compilation.yml       | 58 ++++++++++++++++++-------
 modules/debug/udptty-ingame/imports.lst |  1 +
 3 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 3226758c2..cdbdc31c3 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -10,8 +10,7 @@ jobs:
     steps:
     - name: Install dependencies
       shell: bash
-      run: |
-        sudo apt-get install git make clang-format
+      run: sudo apt-get install git make clang-format
 
     - uses: actions/checkout@v2
 
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
index 51814c44d..3ddd3d624 100644
--- a/.github/workflows/compilation.yml
+++ b/.github/workflows/compilation.yml
@@ -17,12 +17,11 @@ jobs:
 
     - name: git checkout
       uses: actions/checkout@v2
-    - run: |
-        git fetch --prune --unshallow
+
+    - run: git fetch --prune --unshallow
 
     - name: Compile -> make clean release
-      run: |
-        make --trace clean release
+      run: make --trace clean release
 
     - name: Create detailed changelog
       run: sh ./make_changelog.sh
@@ -47,23 +46,23 @@ jobs:
           README.md
 
   build-variants:
-    runs-on: ubuntu-latest
-    container: ps2dev/ps2dev:latest
     strategy:
+      fail-fast: false
       matrix:
         rtl: ["", RTL=1]
         pademu: ["", PADEMU=1]
         igs: ["", IGS=1]
         t10k: ["", DTL_T10000=1]
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev:latest
     steps:
     - name: Install dependencies
-      run: |
-        apk add build-base git
+      run: apk add build-base git zip gawk
 
     - name: git checkout
       uses: actions/checkout@v2
-    - run: |
-        git fetch --prune --unshallow
+
+    - run: git fetch --prune --unshallow
 
     - name: Get version
       id: version
@@ -78,12 +77,41 @@ jobs:
       run: sh ./make_changelog.sh
 
     - name: Upload variants artifact ELF
-      if: ${{ success() }}
       uses: actions/upload-artifact@v2
       with:
         name: OPNPS2LD-VARIANTS
-        path: |
-          OPNPS2LD*.ELF
+        path: OPNPS2LD*.ELF
+
+  build-debug:
+    strategy:
+      fail-fast: false
+      matrix:
+        debug: [debug, iopcore_debug, ingame_debug, deci2_debug] # eesio_debug broken
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev:latest
+    steps:
+    - name: Install dependencies
+      run: apk add build-base git zip gawk
+
+    - name: git checkout
+      uses: actions/checkout@v2
+
+    - run: git fetch --prune --unshallow
+
+    - name: Get version
+      id: version
+      run: echo "::set-output name=version::$(make oplversion)"
+
+    - name: Compile -> make debug
+      run: |
+        make ${{ matrix.debug }} --trace
+        mv opl.elf opl-${{ matrix.debug }}.elf
+
+    - name: Upload variants artifact ELF
+      uses: actions/upload-artifact@v2
+      with:
+        name: opl-debug-${{ steps.version.outputs.version }}-${{ matrix.docker }}
+        path: opl-*.elf
 
   release:
     needs: [build, build-variants]
@@ -92,8 +120,8 @@ jobs:
     steps:
     - name: git checkout
       uses: actions/checkout@v2
-    - run: |
-        git fetch --prune --unshallow
+
+    - run: git fetch --prune --unshallow
 
     - name: Get version
       id: version
diff --git a/modules/debug/udptty-ingame/imports.lst b/modules/debug/udptty-ingame/imports.lst
index b9ec20f4e..1e32df55d 100644
--- a/modules/debug/udptty-ingame/imports.lst
+++ b/modules/debug/udptty-ingame/imports.lst
@@ -1,4 +1,5 @@
 thsemap_IMPORTS_start
+I_CreateSema
 I_DeleteSema
 I_SignalSema
 I_WaitSema