diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ca83a429b..acae0050d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -242,7 +242,7 @@ jobs: dist\${{ matrix.os }}-${{ matrix.arch }}-app.exe windows-sign: - runs-on: windows + runs-on: windows-2022 environment: release needs: [windows-depends, windows-build] steps: diff --git a/scripts/build_windows.ps1 b/scripts/build_windows.ps1 index b0c7e32f2..68f3b11d4 100644 --- a/scripts/build_windows.ps1 +++ b/scripts/build_windows.ps1 @@ -162,8 +162,11 @@ function gatherDependencies() { $depArch=$script:TARGET_ARCH } if ($depArch -eq "x64") { + write-host "cp ${env:VCToolsRedistDir}\${depArch}\Microsoft.VC*.CRT\msvcp140*.dll ${script:DIST_DIR}\lib\ollama\" cp "${env:VCToolsRedistDir}\${depArch}\Microsoft.VC*.CRT\msvcp140*.dll" "${script:DIST_DIR}\lib\ollama\" + write-host "cp ${env:VCToolsRedistDir}\${depArch}\Microsoft.VC*.CRT\vcruntime140.dll ${script:DIST_DIR}\lib\ollama\" cp "${env:VCToolsRedistDir}\${depArch}\Microsoft.VC*.CRT\vcruntime140.dll" "${script:DIST_DIR}\lib\ollama\" + write-host "cp ${env:VCToolsRedistDir}\${depArch}\Microsoft.VC*.CRT\vcruntime140_1.dll ${script:DIST_DIR}\lib\ollama\" cp "${env:VCToolsRedistDir}\${depArch}\Microsoft.VC*.CRT\vcruntime140_1.dll" "${script:DIST_DIR}\lib\ollama\" $llvmCrtDir="$env:VCToolsRedistDir\..\..\..\Tools\Llvm\${depArch}\bin" foreach ($part in $("runtime", "stdio", "filesystem", "math", "convert", "heap", "string", "time", "locale", "environment")) {