Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
c85c0ebf
Unverified
Commit
c85c0ebf
authored
Jun 24, 2025
by
Daniel Hiltgen
Committed by
GitHub
Jun 24, 2025
Browse files
CI: switch windows to vs 2022 (#11184)
* CI: switch windows to vs 2022 * ci: fix regex match
parent
10a8e04a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
.github/workflows/release.yaml
.github/workflows/release.yaml
+6
-3
.github/workflows/test.yaml
.github/workflows/test.yaml
+6
-3
No files found.
.github/workflows/release.yaml
View file @
c85c0ebf
...
@@ -155,6 +155,9 @@ jobs:
...
@@ -155,6 +155,9 @@ jobs:
echo "$hipPath\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "$hipPath\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "CC=$hipPath\bin\clang.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CC=$hipPath\bin\clang.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CXX=$hipPath\bin\clang++.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CXX=$hipPath\bin\clang++.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "HIPCXX=$hipPath\bin\clang++.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "HIP_PLATFORM=amd" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CMAKE_PREFIX_PATH=$hipPath" | Out-File -FilePath $env:GITHUB_ENV -Append
-
if
:
matrix.preset == 'CPU'
-
if
:
matrix.preset == 'CPU'
run
:
|
run
:
|
echo "CC=clang.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CC=clang.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
...
@@ -173,8 +176,8 @@ jobs:
...
@@ -173,8 +176,8 @@ jobs:
key
:
ccache-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.preset }}
key
:
ccache-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.preset }}
-
name
:
Build target "${{ matrix.preset }}"
-
name
:
Build target "${{ matrix.preset }}"
run
:
|
run
:
|
Import-Module 'C:\Program Files
(x86)
\Microsoft Visual Studio\20
19
\Enterprise\Common7\Tools\Microsoft.VisualStudio.DevShell.dll'
Import-Module 'C:\Program Files\Microsoft Visual Studio\20
22
\Enterprise\Common7\Tools\Microsoft.VisualStudio.DevShell.dll'
Enter-VsDevShell -VsInstallPath 'C:\Program Files
(x86)
\Microsoft Visual Studio\20
19
\Enterprise' -SkipAutomaticLocation -DevCmdArguments '-arch=x64 -no_logo'
Enter-VsDevShell -VsInstallPath 'C:\Program Files\Microsoft Visual Studio\20
22
\Enterprise' -SkipAutomaticLocation -DevCmdArguments '-arch=x64 -no_logo'
cmake --preset "${{ matrix.preset }}"
cmake --preset "${{ matrix.preset }}"
cmake --build --parallel --preset "${{ matrix.preset }}"
cmake --build --parallel --preset "${{ matrix.preset }}"
cmake --install build --component "${{ startsWith(matrix.preset, 'CUDA ') && 'CUDA' || startsWith(matrix.preset, 'ROCm ') && 'HIP' || 'CPU' }}" --strip --parallel 8
cmake --install build --component "${{ startsWith(matrix.preset, 'CUDA ') && 'CUDA' || startsWith(matrix.preset, 'ROCm ') && 'HIP' || 'CPU' }}" --strip --parallel 8
...
@@ -241,7 +244,7 @@ jobs:
...
@@ -241,7 +244,7 @@ jobs:
dist\${{ matrix.os }}-${{ matrix.arch }}-app.exe
dist\${{ matrix.os }}-${{ matrix.arch }}-app.exe
windows-sign
:
windows-sign
:
runs-on
:
windows
-2022
runs-on
:
windows
environment
:
release
environment
:
release
needs
:
[
windows-depends
,
windows-build
]
needs
:
[
windows-depends
,
windows-build
]
steps
:
steps
:
...
...
.github/workflows/test.yaml
View file @
c85c0ebf
...
@@ -36,7 +36,7 @@ jobs:
...
@@ -36,7 +36,7 @@ jobs:
| xargs python3 -c "import sys; from pathlib import Path; print(any(Path(x).match(glob) for x in sys.argv[1:] for glob in '$*'.split(' ')))"
| xargs python3 -c "import sys; from pathlib import Path; print(any(Path(x).match(glob) for x in sys.argv[1:] for glob in '$*'.split(' ')))"
}
}
echo changed=$(changed 'llama/llama.cpp/**' 'ml/backend/ggml/ggml/**') | tee -a $GITHUB_OUTPUT
echo changed=$(changed 'llama/llama.cpp/**
/*
' 'ml/backend/ggml/ggml/**
/*
') | tee -a $GITHUB_OUTPUT
linux
:
linux
:
needs
:
[
changes
]
needs
:
[
changes
]
...
@@ -120,6 +120,9 @@ jobs:
...
@@ -120,6 +120,9 @@ jobs:
echo "$hipPath\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "$hipPath\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "CC=$hipPath\bin\clang.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CC=$hipPath\bin\clang.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CXX=$hipPath\bin\clang++.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CXX=$hipPath\bin\clang++.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "HIPCXX=$hipPath\bin\clang++.exe" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "HIP_PLATFORM=amd" | Out-File -FilePath $env:GITHUB_ENV -Append
echo "CMAKE_PREFIX_PATH=$hipPath" | Out-File -FilePath $env:GITHUB_ENV -Append
-
if
:
${{ !cancelled() && steps.cache-install.outputs.cache-hit != 'true' }}
-
if
:
${{ !cancelled() && steps.cache-install.outputs.cache-hit != 'true' }}
uses
:
actions/cache/save@v4
uses
:
actions/cache/save@v4
with
:
with
:
...
@@ -133,8 +136,8 @@ jobs:
...
@@ -133,8 +136,8 @@ jobs:
path
:
${{ github.workspace }}\.ccache
path
:
${{ github.workspace }}\.ccache
key
:
ccache-${{ runner.os }}-${{ runner.arch }}-${{ matrix.preset }}
key
:
ccache-${{ runner.os }}-${{ runner.arch }}-${{ matrix.preset }}
-
run
:
|
-
run
:
|
Import-Module 'C:\Program Files
(x86)
\Microsoft Visual Studio\20
19
\Enterprise\Common7\Tools\Microsoft.VisualStudio.DevShell.dll'
Import-Module 'C:\Program Files\Microsoft Visual Studio\20
22
\Enterprise\Common7\Tools\Microsoft.VisualStudio.DevShell.dll'
Enter-VsDevShell -VsInstallPath 'C:\Program Files
(x86)
\Microsoft Visual Studio\20
19
\Enterprise' -SkipAutomaticLocation -DevCmdArguments '-arch=x64 -no_logo'
Enter-VsDevShell -VsInstallPath 'C:\Program Files\Microsoft Visual Studio\20
22
\Enterprise' -SkipAutomaticLocation -DevCmdArguments '-arch=x64 -no_logo'
cmake --preset "${{ matrix.preset }}" ${{ matrix.flags }}
cmake --preset "${{ matrix.preset }}" ${{ matrix.flags }}
cmake --build --parallel --preset "${{ matrix.preset }}"
cmake --build --parallel --preset "${{ matrix.preset }}"
env
:
env
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment