From 9e9e2a37eea20fd3331a1efeda829519d1f580d2 Mon Sep 17 00:00:00 2001
From: Bilal El Medkouri <bilal.medkouri@fatshark.se>
Date: Fri, 2 Oct 2026 11:40:11 +0200
Subject: [PATCH] CI: don't hide failures of the installer build and exclude
 stale ENV specs

"rake ... & gpgconf --kill all" returned the exit code of gpgconf, so
a failing installer build only surfaced in the following step.

Ruby-4.0.7 and 3.4.11 return ENV keys in UTF-8 on Windows (backport of
https://bugs.ruby-lang.org/issues/20958), but the specs bundled with
these tags still expect the locale encoding. ruby/spec fixed this in
https://github.com/ruby/spec/commit/af6351a2b55f0d1566f7fcb0cc8b732c273e0c5b
---
 .github/workflows/ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c3316b86..43109c48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -167,7 +167,11 @@ jobs:
 
     - name: Build the installer
       shell: cmd
-      run: rake ri:ruby-%target_ruby%-%arch% & c:/msys64/usr/bin/gpgconf --homedir /etc/pacman.d/gnupg --kill all
+      run: |
+        call rake ri:ruby-%target_ruby%-%arch%
+        set rake_exit=%errorlevel%
+        c:/msys64/usr/bin/gpgconf --homedir /etc/pacman.d/gnupg --kill all
+        exit /b %rake_exit%
 
     - name: Reuse installed ruby for RubyInstaller-Devkit
       shell: cmd
@@ -278,7 +282,7 @@ jobs:
           git clone --depth 1 https://github.com/ruby/ruby -b $env:run_mri_spec &&
           cd ruby &&
           curl https://raw.githubusercontent.com/oneclick/rubyinstaller2-packages/refs/heads/master/mingw-w64-ruby40/0016-Windows-Change-command-line-interface-to-UTF-8-specs.patch | patch -p1 &&
-          env --unset=RUBYOPT ruby -C spec/ruby ../mspec/bin/mspec -I../../tool/lib -j  --exclude "CVE-2020-10663 is resisted by only creating custom objects if passed create_additions: true or using JSON.load" --exclude "URI#select conforms to the MatzRuby tests"
+          env --unset=RUBYOPT ruby -C spec/ruby ../mspec/bin/mspec -I../../tool/lib -j  --exclude "CVE-2020-10663 is resisted by only creating custom objects if passed create_additions: true or using JSON.load" --exclude "URI#select conforms to the MatzRuby tests" --exclude "ENV.each_key returns keys in the locale encoding" --exclude "ENV.keys returns the keys in the locale encoding"
         }
 
     - name: Verify that the used CA list is still the latest.