From ce9861af00f2aac05a01efdd234c5e28ec8d21f5 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 17 May 2026 14:33:25 -0700
Subject: [PATCH] ci: drop Debug matrix entries and replace ISLE_DEBUG with
 ISLE_CITRO3D_DEBUG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Linux (Debug) and MSVC (x64 Debug) jobs only differed from their
Release counterparts in -DISLE_DEBUG=ON. ISLE_DEBUG was only consulted
in one place: miniwin/CMakeLists.txt for the Nintendo 3DS citro3d
library selection (citro3dd vs citro3d) — which the Nintendo 3DS matrix
row never enabled. So Linux (Debug)/MSVC (x64 Debug) produced binaries
identical to their Release builds and collided with them in the release
artifact merge, which is what corrupted #646.

Drop the two duplicate matrix entries and the now-unused ISLE_DEBUG
plumbing, and reintroduce the 3DS knob as ISLE_CITRO3D_DEBUG scoped to
its actual use site.

Reverts the -debug filename suffix added in the previous commit; with
the duplicates gone there is nothing left to disambiguate.

Fixes #646
---
 .github/workflows/ci.yml | 12 ------------
 CMakeLists.txt           |  3 ---
 miniwin/CMakeLists.txt   |  3 ++-
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9d3c760..a1fb48cc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,10 +38,8 @@ jobs:
       matrix:
         include:
           - { name: 'Linux',               os: 'ubuntu-latest',  generator: 'Ninja',                 dx5: false, config: true,  linux: true, werror: true,   clang-tidy: true, build-assets: true }
-          - { name: 'Linux (Debug)',       os: 'ubuntu-latest',  generator: 'Ninja',                 dx5: false, config: true,  linux: true, werror: true,   clang-tidy: true,   debug: true }
           - { name: 'MSVC (x86)',          os: 'windows-latest', generator: 'Ninja',                 dx5: true,  config: false, msvc: true,  werror: false,  clang-tidy: false,  vc-arch: 'amd64_x86' }
           - { name: 'MSVC (x64)',          os: 'windows-latest', generator: 'Ninja',                 dx5: false, config: true,  msvc: true,  werror: false,  clang-tidy: false,   vc-arch: 'amd64' }
-          - { name: 'MSVC (x64 Debug)',    os: 'windows-latest', generator: 'Ninja',                 dx5: false, config: true,  msvc: true,  werror: false,  clang-tidy: false,   vc-arch: 'amd64',   debug: true }
           - { name: 'MSVC (arm64)',        os: 'windows-latest', generator: 'Ninja',                 dx5: false, config: false, msvc: true,  werror: false,  clang-tidy: false,  vc-arch: 'amd64_arm64' }
           - { name: 'msys2 mingw64',       os: 'windows-latest', generator: 'Ninja',                 dx5: false, config: true,  mingw: true, werror: true,   clang-tidy: true,   msystem: 'mingw64', msys-env: 'mingw-w64-x86_64', shell: 'msys2 {0}' }
           - { name: 'macOS',               os: 'macos-latest',   generator: 'Ninja',                 dx5: false, config: true,  brew: true,  werror: true,   clang-tidy: false }
@@ -180,7 +178,6 @@ jobs:
               -DISLE_BUILD_CONFIG=${{ !!matrix.config }} \
               -DENABLE_CLANG_TIDY=${{ !!matrix.clang-tidy  }} \
               -DISLE_WERROR=${{ !!matrix.werror }} \
-              -DISLE_DEBUG=${{ matrix.debug || 'OFF' }} \
               -Werror=dev"
 
       - name: Configure (CMake)
@@ -194,7 +191,6 @@ jobs:
             -DISLE_BUILD_ASSETS=${{ !!matrix.build-assets }} \
             -DENABLE_CLANG_TIDY=${{ !!matrix.clang-tidy  }} \
             -DISLE_WERROR=${{ !!matrix.werror }} \
-            -DISLE_DEBUG=${{ matrix.debug || 'OFF' }} \
             -Werror=dev
 
       - name: Build (CMake)
@@ -243,14 +239,6 @@ jobs:
             --output appimage && \
           mv *.AppImage dist/
 
-      - name: Suffix debug AppImage
-        if: ${{ matrix.linux && matrix.debug }}
-        run: |
-          cd build/dist
-          for f in *.AppImage; do
-            mv "$f" "${f%.AppImage}-debug.AppImage"
-          done
-
       - name: Package (3DS)
         if: ${{ matrix.n3ds }}
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dcb466f..e668f624 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1083,9 +1083,6 @@ add_subdirectory(packaging)
 
 set(CPACK_PACKAGE_DIRECTORY "dist")
 set(CPACK_PACKAGE_FILE_NAME "isle-${PROJECT_VERSION}-${ISLE_PACKAGE_NAME}")
-if(ISLE_DEBUG)
-  string(APPEND CPACK_PACKAGE_FILE_NAME "-debug")
-endif()
 if(NINTENDO_3DS)
   find_program(BANNERTOOL bannertool)
   find_program(MAKEROM makerom)
diff --git a/miniwin/CMakeLists.txt b/miniwin/CMakeLists.txt
index 1be54f00..43601668 100644
--- a/miniwin/CMakeLists.txt
+++ b/miniwin/CMakeLists.txt
@@ -111,7 +111,8 @@ if(VITA)
 endif()
 
 if(NINTENDO_3DS)
-  if(ISLE_DEBUG)
+  option(ISLE_CITRO3D_DEBUG "Link the debug build of citro3d (citro3dd) on Nintendo 3DS" OFF)
+  if(ISLE_CITRO3D_DEBUG)
     find_library(CITRO3D_LIBRARY NAMES citro3dd)
   else()
     find_library(CITRO3D_LIBRARY NAMES citro3d)