Set MSYS2_PATH_TYPE=inherit

diskuv · Oct 23, 2024 · ef9fc54 · ef9fc54
1 parent f254645
commit ef9fc54
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -17,6 +17,7 @@
 - Remove unused `opam_abi` from the test matrix.
 - Add `--assume-depexts` during install of OCaml compiler. That means system packages are not auto-installed and your CI system will need to explicitly add any requirements like `g++-multilib gcc-multilib` for linux_x86.
 - Show Dockerfile when a Docker container or dockcross is selected.
+- Set `MSYS2_PATH_TYPE=inherit` on Windows so that `bash -l` keeps the environment, especially any MSVC environment
 
 ## 2.1.3
 

diff --git a/test/gl/setup-dkml.gitlab-ci.yml b/test/gl/setup-dkml.gitlab-ci.yml
@@ -279,6 +279,7 @@ variables:
   variables:
     # https://patchwork.kernel.org/project/qemu-devel/patch/20211215073402.144286-17-thuth@redhat.com/
     CHERE_INVOKING: "yes" # Preserve the current working directory
+    MSYS2_PATH_TYPE: "inherit" # Keep the existing environment when sh -l, especially MSVC environment
     MSYSTEM: '${msys2_system}' # Start a 64 bit environment if CLANG64, etc.
   tags: [saas-windows-medium-amd64]
   timeout: 2h

diff --git a/test/pc/setup-dkml-windows_x86.ps1 b/test/pc/setup-dkml-windows_x86.ps1
@@ -1100,6 +1100,7 @@ $env:PIN_ZED = $PIN_ZED
 
 # https://patchwork.kernel.org/project/qemu-devel/patch/20211215073402.144286-17-thuth@redhat.com/
 $env:CHERE_INVOKING = "yes" # Preserve the current working directory
+$env:MSYS2_PATH_TYPE = "inherit" # Keep the existing environment when sh -l, especially MSVC environment
 $env:MSYSTEM = $env:msys2_system # Start a 64 bit environment if CLANG64, etc.
 
 ########################### before_script ###############################

diff --git a/test/pc/setup-dkml-windows_x86_64.ps1 b/test/pc/setup-dkml-windows_x86_64.ps1
@@ -1100,6 +1100,7 @@ $env:PIN_ZED = $PIN_ZED
 
 # https://patchwork.kernel.org/project/qemu-devel/patch/20211215073402.144286-17-thuth@redhat.com/
 $env:CHERE_INVOKING = "yes" # Preserve the current working directory
+$env:MSYS2_PATH_TYPE = "inherit" # Keep the existing environment when sh -l, especially MSVC environment
 $env:MSYSTEM = $env:msys2_system # Start a 64 bit environment if CLANG64, etc.
 
 ########################### before_script ###############################

diff --git a/tmpl/gl/setup-dkml.gitlab-ci.yml b/tmpl/gl/setup-dkml.gitlab-ci.yml
@@ -89,6 +89,7 @@ variables:
   variables:
     # https://patchwork.kernel.org/project/qemu-devel/patch/20211215073402.144286-17-thuth@redhat.com/
     CHERE_INVOKING: "yes" # Preserve the current working directory
+    MSYS2_PATH_TYPE: "inherit" # Keep the existing environment when sh -l, especially MSVC environment
     MSYSTEM: '${msys2_system}' # Start a 64 bit environment if CLANG64, etc.
   tags: [saas-windows-medium-amd64]
   timeout: 2h

diff --git a/tmpl/pc/setup-dkml-windows_x86.ps1 b/tmpl/pc/setup-dkml-windows_x86.ps1
@@ -138,6 +138,7 @@ $env:DKML_HOME = $DKML_HOME
 
 # https://patchwork.kernel.org/project/qemu-devel/patch/20211215073402.144286-17-thuth@redhat.com/
 $env:CHERE_INVOKING = "yes" # Preserve the current working directory
+$env:MSYS2_PATH_TYPE = "inherit" # Keep the existing environment when sh -l, especially MSVC environment
 $env:MSYSTEM = $env:msys2_system # Start a 64 bit environment if CLANG64, etc.
 
 ########################### before_script ###############################

diff --git a/tmpl/pc/setup-dkml-windows_x86_64.ps1 b/tmpl/pc/setup-dkml-windows_x86_64.ps1
@@ -138,6 +138,7 @@ $env:DKML_HOME = $DKML_HOME
 
 # https://patchwork.kernel.org/project/qemu-devel/patch/20211215073402.144286-17-thuth@redhat.com/
 $env:CHERE_INVOKING = "yes" # Preserve the current working directory
+$env:MSYS2_PATH_TYPE = "inherit" # Keep the existing environment when sh -l, especially MSVC environment
 $env:MSYSTEM = $env:msys2_system # Start a 64 bit environment if CLANG64, etc.
 
 ########################### before_script ###############################