From 4ca649154d438017924de3452bca9f98ea623d75 Mon Sep 17 00:00:00 2001 From: "LocalAI [bot]" <139863280+localai-bot@users.noreply.github.com> Date: Tue, 26 Dec 2023 18:53:59 +0100 Subject: [PATCH 1/2] :arrow_up: Update ggerganov/llama.cpp (#1495) Signed-off-by: GitHub Co-authored-by: mudler --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b11baeaedb22..d54176f9df93 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ GOLLAMA_VERSION?=aeba71ee842819da681ea537e78846dc75949ac0 GOLLAMA_STABLE_VERSION?=50cee7712066d9e38306eccadcfbb44ea87df4b7 -CPPLLAMA_VERSION?=b9f47952ffae4e0d3420905526003c23333f6c98 +CPPLLAMA_VERSION?=a206137f927daef1752753cf5e281220b449a468 # gpt4all version GPT4ALL_REPO?=https://github.com/nomic-ai/gpt4all From ae0c48e6bd9ecdaab0ccfea951ca2c8d76a8706a Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Tue, 26 Dec 2023 13:19:37 -0500 Subject: [PATCH 2/2] ci(apple): speedups (#1471) * ci(apple): install grpc from brew * ci(apple): use brew deps also on release * ci(linux): install grpc from package manager * ci: set concurrency * Revert "ci(linux): install grpc from package manager" This reverts commit 004e3e308ee115a2f8be8dcca5adb14bd2ef2397. --- .github/workflows/release.yaml | 9 +++++---- .github/workflows/test.yml | 5 +---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 239f5726a2cd..e5fd84c425b7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,6 +5,10 @@ on: push permissions: contents: write +concurrency: + group: ci-releases-${{ github.head_ref || github.ref }}-${{ github.repository }} + cancel-in-progress: true + jobs: build-linux: strategy: @@ -74,10 +78,7 @@ jobs: go-version: '>=1.21.0' - name: Dependencies run: | - git clone --recurse-submodules -b v1.58.0 --depth 1 --shallow-submodules https://github.com/grpc/grpc && \ - cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \ - -DgRPC_BUILD_TESTS=OFF \ - ../.. && make -j12 install && rm -rf grpc + brew install protobuf grpc - name: Build id: build env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a347c80fd857..89c6c512df28 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -114,10 +114,7 @@ jobs: run: go version - name: Dependencies run: | - git clone --recurse-submodules -b v1.58.0 --depth 1 --shallow-submodules https://github.com/grpc/grpc && \ - cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \ - -DgRPC_BUILD_TESTS=OFF \ - ../.. && make -j12 install && rm -rf grpc + brew install protobuf grpc - name: Test run: | export C_INCLUDE_PATH=/usr/local/include