Merge pull request #3376 from ollama/mxyng/conditional-generate

only generate on changes to llm subdirectory
ollama · Mar 27, 2024 · 461ad25 · 461ad25
2 parents c363282 + 8838ae7
commit 461ad25
Showing 1 changed file with 36 additions and 13 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -23,11 +23,14 @@ jobs:
           }
 
           {
-            echo GENERATE_CUDA=$(changed llm)
-            echo GENERATE_ROCM=$(changed llm)
+            echo GENERATE=$(changed llm/)
+            echo GENERATE_CUDA=$(changed llm/)
+            echo GENERATE_ROCM=$(changed llm/)
           } >>$GITHUB_OUTPUT
 
   generate:
+    needs: [changes]
+    if: ${{ needs.changes.outputs.GENERATE == 'True' }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-2019]
@@ -150,21 +153,26 @@ jobs:
           go-version: '1.22'
           cache: false
       - run: |
-          mkdir -p llm/llama.cpp/build/linux/${{ matrix.arch }}/stub/lib/
-          touch llm/llama.cpp/build/linux/${{ matrix.arch }}/stub/lib/stub.so
+          case ${{ matrix.arch }} in
+            amd64) echo ARCH=x86_64 ;;
+            arm64) echo ARCH=arm64 ;;
+          esac >>$GITHUB_ENV
+        shell: bash
+      - run: |
+          mkdir -p llm/llama.cpp/build/linux/$ARCH/stub/lib/
+          touch llm/llama.cpp/build/linux/$ARCH/stub/lib/stub.so
         if: ${{ startsWith(matrix.os, 'ubuntu-') }}
       - run: |
-          mkdir -p llm/llama.cpp/build/darwin/${{ matrix.arch }}/stub/lib/
-          touch llm/llama.cpp/build/darwin/${{ matrix.arch }}/stub/lib/stub.dylib
+          mkdir -p llm/llama.cpp/build/darwin/$ARCH/stub/lib/
+          touch llm/llama.cpp/build/darwin/$ARCH/stub/lib/stub.dylib
           touch llm/llama.cpp/ggml-metal.metal
         if: ${{ startsWith(matrix.os, 'macos-') }}
       - run: |
-          mkdir -p llm/llama.cpp/build/windows/${{ matrix.arch }}/stub/lib/
-          touch llm/llama.cpp/build/windows/${{ matrix.arch }}/stub/lib/stub.dll
+          mkdir -p llm/llama.cpp/build/windows/$ARCH/stub/stub/lib/
+          touch llm/llama.cpp/build/windows/$ARCH/stub/stub/lib/stub.dll
         if: ${{ startsWith(matrix.os, 'windows-') }}
       - uses: golangci/golangci-lint-action@v3
   test:
-    needs: generate
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-2019]
@@ -187,10 +195,25 @@ jobs:
           go-version: '1.22'
           cache: true
       - run: go get
-      - uses: actions/download-artifact@v4
-        with:
-          name: ${{ matrix.os }}-${{ matrix.arch }}-libraries
-          path: llm/llama.cpp/build
+      - run: |
+          case ${{ matrix.arch }} in
+            amd64) echo ARCH=x86_64 ;;
+            arm64) echo ARCH=arm64 ;;
+          esac >>$GITHUB_ENV
+        shell: bash
+      - run: |
+          mkdir -p llm/llama.cpp/build/linux/$ARCH/stub/lib/
+          touch llm/llama.cpp/build/linux/$ARCH/stub/lib/stub.so
+        if: ${{ startsWith(matrix.os, 'ubuntu-') }}
+      - run: |
+          mkdir -p llm/llama.cpp/build/darwin/$ARCH/stub/lib/
+          touch llm/llama.cpp/build/darwin/$ARCH/stub/lib/stub.dylib
+          touch llm/llama.cpp/ggml-metal.metal
+        if: ${{ startsWith(matrix.os, 'macos-') }}
+      - run: |
+          mkdir -p llm/llama.cpp/build/windows/$ARCH/stub/stub/lib/
+          touch llm/llama.cpp/build/windows/$ARCH/stub/stub/lib/stub.dll
+        if: ${{ startsWith(matrix.os, 'windows-') }}
       - run: go build
       - run: go test -v ./...
       - uses: actions/upload-artifact@v4