Fix 4

rnpgp · Nov 9, 2024 · 90477cb · 90477cb
1 parent d6d26a0
commit 90477cb
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml
@@ -133,28 +133,23 @@ jobs:
 
       - name: Test
         run: |
-          mkdir -p "build/Testing/Temporary"
-          cp "cmake/CTestCostData.txt" "build/Testing/Temporary"
-          export LC_ALL="en_US.UTF-8"
-          export LANG="en_US.UTF-8"
-          export PYTHONIOENCODING=utf-8
-          export PYTHONUTF8=1
-          export PATH="$PWD/build/src/lib:$PATH"
-          export RNP_LOG_CONSOLE=1
-          # Add mt.exe (manifest tool) to PATH
-          export PATH="$lib_dir":"/c/Program Files (x86)/Windows Kits/10/bin/10.0.22621.0/x64/":$PATH
-          #find /c/Program\ Files\ \(x86\) -name "mt.exe"
+          # Add mt.exe (manifest tool) to the PATH
+          export PATH="/c/Program Files (x86)/Windows Kits/10/bin/10.0.22621.0/x64/":$PATH
           #win_sdk=$(reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" | awk '{print $3}' | sort -r | head -n 1)
           reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots"
-          win_sdk=$(reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" | sort -r | head -n 1)
+          win_sdk=$(reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" | sort -r | head -n 1 | sed 's/.*\\//')
           echo "Windows SDK: $win_sdk"
           pwd
           # Add manifest which forces utf-8 encoding
-          mt.exe -manifest ./ci/utf8-manifest "-outputresource:./build/src/tests/rnp_tests.exe;1"
-          mt.exe -manifest ./ci/utf8-manifest "-outputresource:./build/src/rnp/rnp.exe;1"
-          mt.exe -manifest ./ci/utf8-manifest "-outputresource:./build/src/rnpkeys/rnpkeys.exe;1"
+          for exe in "tests/rnp_tests" "rnp/rnp" "rnpkeys/rnpkeys"; do
+            mt.exe -manifest ./ci/utf8-manifest "-outputresource:./build/src/${exe}.exe;1"
+          done
+          mkdir -p "build/Testing/Temporary"
+          cp "cmake/CTestCostData.txt" "build/Testing/Temporary"
+          export PATH="$PWD/build/src/lib:$PATH"
+          export RNP_LOG_CONSOLE=1
           ctest --test-dir build -C Debug -V -R rnp_tests.test_windows_unicode || true
-          ctest --parallel ${{ env.CORES }} --test-dir build -C Debug --output-on-failure -R rnp_tests.test_cli_rnpkeys_unicode
+          ctest --parallel ${{ env.CORES }} --test-dir build -C Debug --output-on-failure
 
       - name: Install
         run: cmake --install build