Merge 3972a8c6a5 into edea8a9c3c

whisper : prefer curl over wget in download scripts (#3409 )
On busybox-based systems like Alpine Linux, wget does not have certain CLI flags such as '--no-config'. Thus, search for the existence of 'curl' first in the PATH before wget. wget2 is still the preferred download tool.
2025-09-15 13:28:35 +08:00 · 2025-09-13 02:58:51 +07:00 · 2025-09-08 06:32:19 +02:00 · 2025-09-05 15:20:32 +02:00 · 2025-01-29 14:33:49 +01:00
2 changed files with 5 additions and 4 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -241,7 +241,8 @@ jobs:
      - name: Dependencies
        run: |
          brew update
-          brew install sdl2 cmake
+          cmake --version
+          brew install sdl2

      - name: Build
        run: |
--- a/models/download-ggml-model.sh
+++ b/models/download-ggml-model.sh
@ -119,12 +119,12 @@ fi

 if [ -x "$(command -v wget2)" ]; then
    wget2 --no-config --progress bar -O ggml-"$model".bin $src/$pfx-"$model".bin
-elif [ -x "$(command -v wget)" ]; then
-    wget --no-config --quiet --show-progress -O ggml-"$model".bin $src/$pfx-"$model".bin
 elif [ -x "$(command -v curl)" ]; then
    curl -L --output ggml-"$model".bin $src/$pfx-"$model".bin
+elif [ -x "$(command -v wget)" ]; then
+    wget --no-config --quiet --show-progress -O ggml-"$model".bin $src/$pfx-"$model".bin
 else
-    printf "Either wget or curl is required to download models.\n"
+    printf "Either wget2, curl, or wget is required to download models.\n"
    exit 1
 fi
Author	SHA1	Message	Date
kristianmk	b7277b8d40	Merge `3972a8c6a5` into `edea8a9c3c`	2025-09-13 02:58:51 +07:00
Siva Mahadevan	edea8a9c3c	whisper : prefer curl over wget in download scripts (#3409 ) Some checks failed Bindings Tests (Ruby) / ubuntu-22 (push) Has been cancelled Details Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/main-cuda.Dockerfile platform:linux/amd64 tag:main-cuda]) (push) Has been cancelled Details Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/main-intel.Dockerfile platform:linux/amd64 tag:main-intel]) (push) Has been cancelled Details Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/main-musa.Dockerfile platform:linux/amd64 tag:main-musa]) (push) Has been cancelled Details Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/main.Dockerfile platform:linux/amd64 tag:main]) (push) Has been cancelled Details Examples WASM / deploy-wasm-github-pages (push) Has been cancelled Details On busybox-based systems like Alpine Linux, wget does not have certain CLI flags such as '--no-config'. Thus, search for the existence of 'curl' first in the PATH before wget. wget2 is still the preferred download tool.	2025-09-08 06:32:19 +02:00
Daniel Bevenius	bb0e1fc60f	ci : remove brew installation of cmake for macos-latest (#3408 ) Some checks failed Bindings Tests (Ruby) / ubuntu-22 (push) Has been cancelled Details Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/main-cuda.Dockerfile platform:linux/amd64 tag:main-cuda]) (push) Has been cancelled Details Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/main-intel.Dockerfile platform:linux/amd64 tag:main-intel]) (push) Has been cancelled Details Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/main-musa.Dockerfile platform:linux/amd64 tag:main-musa]) (push) Has been cancelled Details Publish Docker image / Push Docker image to Docker Hub (map[dockerfile:.devops/main.Dockerfile platform:linux/amd64 tag:main]) (push) Has been cancelled Details Examples WASM / deploy-wasm-github-pages (push) Has been cancelled Details This commit remove the brew install of cmake for macos-latest as this now seems to be pre-installed on the runner. The motivation for this is that this job is failing with the following error: ```console Error: cmake was installed from the local/pinned tap but you are trying to install it from the homebrew/core tap. Formulae with the same name from different taps cannot be installed at the same time. ```	2025-09-05 15:20:32 +02:00
kristianmk	3972a8c6a5	talk-llama : add check for deepseek-r1-qwen in llama-vocab.cpp	2025-01-29 14:33:49 +01:00