Revert "build.go: introduce a friendlier way to build Ollama (#3548)" (#3564)

.github/workflows/release.yaml

@@ -95,8 +95,7 @@ jobs:
           cd $env:GITHUB_WORKSPACE
           $env:CMAKE_SYSTEM_VERSION="10.0.22621.0"
           $env:PATH="$gopath;$env:PATH"
-          
-          $env:GOARCH = ""; go run build.go -f -d -target=${{ matrix.arch }}
+          go generate -x ./...
         name: go generate
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/test.yaml

@@ -1,16 +1,5 @@
 name: test
 
-concurrency:
-  # For PRs, later CI runs preempt previous ones. e.g. a force push on a PR
-  # cancels running CI jobs and starts all new ones.
-  #
-  # For non-PR pushes, concurrency.group needs to be unique for every distinct
-  # CI run we want to have happen. Use run_id, which in practice means all
-  # non-PR CI runs will be allowed to run without preempting each other.
-  group: ${{ github.workflow }}-$${{ github.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
-
 on:
   pull_request:
     paths:
@@ -73,12 +62,10 @@ jobs:
           $env:CMAKE_SYSTEM_VERSION="10.0.22621.0"
           $env:PATH="$gopath;$gccpath;$env:PATH"
           echo $env:PATH
-
-          $env:GOARCH = ""; go run build.go -f -d -target=${{ matrix.arch }}
+          go generate -x ./...
         if: ${{ startsWith(matrix.os, 'windows-') }}
         name: 'Windows Go Generate'
-      - run: |
-          GOARCH= go run build.go -f -d -target=${{ matrix.arch }}
+      - run: go generate -x ./...
         if: ${{ ! startsWith(matrix.os, 'windows-') }}
         name: 'Unix Go Generate'
       - uses: actions/upload-artifact@v4
@@ -111,7 +98,7 @@ jobs:
       - run: go get ./...
       - run: |
           git config --global --add safe.directory /__w/ollama/ollama
-          GOARCH= go run build.go -f -d -target=${{ matrix.arch }}
+          go generate -x ./...
         env:
           OLLAMA_SKIP_CPU_GENERATE: '1'
       - uses: actions/upload-artifact@v4
@@ -142,7 +129,7 @@ jobs:
       - run: go get ./...
       - run: |
           git config --global --add safe.directory /__w/ollama/ollama
-          GOARCH= go run build.go -f -d -target=${{ matrix.arch }}
+          go generate -x ./...
         env:
           OLLAMA_SKIP_CPU_GENERATE: '1'
       - uses: actions/upload-artifact@v4
@@ -181,9 +168,8 @@ jobs:
           $env:PATH="$gopath;$env:PATH"
           $env:OLLAMA_SKIP_CPU_GENERATE="1"
           $env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
-
-          $env:GOARCH = ""; go run build.go -f -d -target=${{ matrix.arch }}
-        name: go run build.go
+          go generate -x ./...
+        name: go generate
         env:
           OLLAMA_SKIP_CPU_GENERATE: '1'
       # TODO - do we need any artifacts?
@@ -216,7 +202,7 @@ jobs:
       - name: 'Verify CUDA'
         run: nvcc -V
       - run: go get ./...
-      - name: go run build.go
+      - name: go generate
         run: |
           $gopath=(get-command go).source | split-path -parent
           $cudabin=(get-command nvcc).source | split-path
@@ -225,8 +211,7 @@ jobs:
           $env:CMAKE_SYSTEM_VERSION="10.0.22621.0"
           $env:PATH="$gopath;$cudabin;$env:PATH"
           $env:OLLAMA_SKIP_CPU_GENERATE="1"
-          
-          $env:GOARCH = ""; go run build.go -f -d -target=${{ matrix.arch }}
+          go generate -x ./...
         env:
           OLLAMA_SKIP_CPU_GENERATE: '1'
       # TODO - do we need any artifacts?
@@ -300,12 +285,6 @@ jobs:
         with:
           go-version-file: go.mod
           cache: true
-      - run: |
-          GOARCH= go run build.go -f -d -target=${{ matrix.arch }}
-        if: ${{ ! startsWith(matrix.os, 'windows-') }}
-      - run: |
-          $env:GOARCH = ""; go run build.go -f -d -target=${{ matrix.arch }}
-        if: ${{ startsWith(matrix.os, 'windows-') }}
       - run: go get
       - run: |
           case ${{ matrix.arch }} in
@@ -326,8 +305,9 @@ jobs:
           touch llm/build/windows/$ARCH/stub/bin/ollama_llama_server
         if: ${{ startsWith(matrix.os, 'windows-') }}
         shell: bash
-      - run: |
-          go test -v ./...
+      - run: go generate ./...
+      - run: go build
+      - run: go test -v ./...
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-binaries