Conan

howetuft · Aug 16, 2024 · 2da8be5 · 2da8be5
1 parent 771ed65
commit 2da8be5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/actions/windows-build-system/action.yml b/.github/actions/windows-build-system/action.yml
@@ -60,12 +60,17 @@ runs:
         mkdir -p /c/users/runneradmin/.conan2/profiles
         cp ../conan_profile /c/users/runneradmin/.conan2/profiles/default
         cp ../conanfile.py .
+      shell:
+        bash
 
+
+    - name: Initialize Conan
+      run:
         # Create local packages (openimageio, oidn)
         conan install --build=missing ../externals/windows/libvpx  -s build_type=Release
         conan create ../externals/windows/openimageio
         conan create ../externals/windows/oidn
-      shell: bash
+      shell: pwsh
 
     #- uses: mxschmitt/action-tmate@v3
 

diff --git a/conan_profile b/conan_profile
@@ -10,6 +10,6 @@ os=Windows
 [conf]
 tools.cmake.cmaketoolchain:generator=Ninja
 tools.env.virtualenv:powershell=False
-tools.microsoft.bash:active=True
+tools.microsoft.bash:active=False
 tools.microsoft.bash:path=C:/shells/gitbash.exe
 tools.microsoft.bash:subsystem=msys2