From ea4be7d1735db12713601be53be0c6c08d479be8 Mon Sep 17 00:00:00 2001
From: Zephyron <zephyron@citron-emu.org>
Date: Sat, 20 Sep 2025 19:58:00 +1000
Subject: [PATCH] ci: Revert to last known working configuration

- Restored the working .gitlab-ci.yml configuration
- Removed the problematic CMAKE_FLAGS variable approach
- Back to inline cmake command that was working
- Uses CachyOS with perl-digest-sha for proper shasum support
- Maintains all build optimizations and AppImage creation
- This should resolve the YAML parsing issues
---
 .gitlab-ci.yml | 40 +++++-----------------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bd17e52e..69fe30b13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,21 +9,6 @@ variables:
   CMAKE_BUILD_PARALLEL_LEVEL: "4"
   DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
-  # Define CMAKE_FLAGS here to avoid issues in the script section
-  CMAKE_FLAGS: >
-    -GNinja
-    -DCITRON_ENABLE_LTO=ON
-    -DCITRON_USE_BUNDLED_VCPKG=ON
-    -DCITRON_TESTS=OFF
-    -DCITRON_USE_LLVM_DEMANGLE=OFF
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DCMAKE_CXX_FLAGS="-march=core2 -mtune=core2 -Wno-error"
-    -DCMAKE_C_FLAGS="-march=core2 -mtune=core2"
-    -DUSE_DISCORD_PRESENCE=OFF
-    -DBUNDLE_SPEEX=ON
-    -DCMAKE_SYSTEM_PROCESSOR=x86_64
-    -DCMAKE_BUILD_TYPE=Release
-    -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 # Cache configuration for faster builds
 cache:
@@ -54,19 +39,12 @@ build-linux:
     - pacman -S --noconfirm nasm
     - pacman -S --noconfirm glslang
     - pacman -S --noconfirm fuse2 gdb
-    # Create shasum compatibility wrapper for AppImage build
-    - echo '#!/bin/bash' > /usr/local/bin/shasum
-    - echo 'if [ "$1" = "-a" ] && [ "$2" = "256" ]; then' >> /usr/local/bin/shasum
-    - echo '  shift 2' >> /usr/local/bin/shasum
-    - echo '  sha256sum "$@"' >> /usr/local/bin/shasum
-    - echo 'else' >> /usr/local/bin/shasum
-    - echo '  sha256sum "$@"' >> /usr/local/bin/shasum
-    - echo 'fi' >> /usr/local/bin/shasum
-    - chmod +x /usr/local/bin/shasum
+    # Install shasum for AppImage compatibility  
+    - pacman -S --noconfirm perl-digest-sha
   script:
     - git submodule update --init --recursive
     - mkdir -p build && cd build
-     - cmake .. $CMAKE_FLAGS
+    - cmake .. -GNinja -DCITRON_ENABLE_LTO=ON -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_TESTS=OFF -DCITRON_USE_LLVM_DEMANGLE=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="-march=core2 -mtune=core2 -Wno-error" -DCMAKE_C_FLAGS="-march=core2 -mtune=core2" -DUSE_DISCORD_PRESENCE=OFF -DBUNDLE_SPEEX=ON -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5
     - ninja
     - cd ..
     - echo "Build completed, checking for executables..."
@@ -91,17 +69,9 @@ build-linux:
     - du -h *.AppImage || echo "No AppImage to measure"
     - echo "Total artifact size:"
     - du -sh citron.AppImage build/bin/citron 2>/dev/null || echo "Cannot measure artifact sizes"
-    - echo "Compressing AppImage for upload..."
-    - gzip -9 citron.AppImage
-    - ls -la citron.AppImage.gz
-    - echo "Compressed AppImage size:"
-    - du -h citron.AppImage.gz
-    - echo "Note: AppImage has been compressed for artifact upload due to size limits"
-    - echo "To use: Download citron.AppImage.gz, then run:"
-    - echo "gunzip citron.AppImage.gz && chmod +x citron.AppImage"
   artifacts:
     paths:
-      - citron.AppImage.gz
+      - citron.AppImage
     expire_in: 1 week
     when: always
   only:
@@ -199,4 +169,4 @@ package-release:
     - master
     - develop
     - ci-fixes
-    - tags
+    - tags
\ No newline at end of file