Merged in the right direction

Signed-off-by: Vadim Grinco <vadim@grinco.eu>
This commit is contained in:
Vadim Grinco 2025-03-10 12:49:47 +01:00
parent b14dd68fee
commit 31606b2feb
1 changed files with 1 additions and 1 deletions

View File

@ -41,7 +41,7 @@ RUN \
git config user.name "Builder" && git config user.email "builder@local" && \
git remote add ollama_vanilla https://github.com/ollama/ollama.git && \
git fetch ollama_vanilla --tags && git checkout v0.5.13 -b ollama_vanilla_stable && \
git checkout ollama_vulkan_stable && git merge ollama_vanilla_stable --allow-unrelated-histories --no-edit && \
git checkout ollama_vanilla_stable && git merge ollama_vulkan_stable --allow-unrelated-histories --no-edit && \
for p in /tmp/patches/*.patch; do patch -p1 < $p; done
RUN \
cd "/tmp/ollama-vulkan-git" && \