From a5b3edba3d9852474a67df809924e0b55a9a0a15 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 25 Sep 2024 21:10:33 +0200
Subject: [PATCH] fixup! ci: add a workflow to test custom MSYS2 runtimes

---
 .github/workflows/test-msys2-runtime.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-msys2-runtime.yml b/.github/workflows/test-msys2-runtime.yml
index 54d2fda3..06c2bc0d 100644
--- a/.github/workflows/test-msys2-runtime.yml
+++ b/.github/workflows/test-msys2-runtime.yml
@@ -108,8 +108,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p minimal-sdk &&
-          tar -C minimal-sdk -xzf git-sdk-x86_64-minimal.tar.gz &&
-          minimal-sdk/init.sh
+          tar -C minimal-sdk -xzf git-sdk-x86_64-minimal.tar.gz
       - name: download git artifacts
         uses: actions/download-artifact@v4
         with:
@@ -126,6 +125,7 @@ jobs:
         shell: bash
         run: |
           set -x
+          . /etc/profile
           test "$(cygpath -aw /)" = "${{github.workspace}}\minimal-sdk" || exit 1
           cd "$GIT_ARTIFACTS_EXTRACT_LOCATION"/git/t &&
           make T="$(ls -S t[0-9]*.sh | awk '!((NR+${{matrix.nr}})%17)' | tr '\n' \ )" prove || {
@@ -157,14 +157,14 @@ jobs:
         shell: bash
         run: |
           mkdir -p minimal-sdk &&
-          tar -C minimal-sdk -xzf git-sdk-x86_64-minimal.tar.gz &&
-          minimal-sdk/init.sh
+          tar -C minimal-sdk -xzf git-sdk-x86_64-minimal.tar.gz
       - name: run some tests
         shell: bash
         env:
           PATH: ${{github.workspace}}\minimal-sdk\mingw64\bin;${{github.workspace}}\minimal-sdk\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\system32\wbem
         run: |
           set -x
+          . /etc/profile
 
           # cygpath works
           test "$(cygpath -aw /)" = "${{github.workspace}}\minimal-sdk" || exit 1