diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2aebe93..2d73546 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -54,7 +54,7 @@ jobs: retention-days: ${{ inputs.artifacts-retention-days }} build-linux-arm64: - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04-arm steps: - uses: actions/checkout@v4 with: @@ -72,22 +72,14 @@ jobs: - uses: actions/setup-node@v4.0.2 with: node-version: 20 - cache: "yarn" + - name: Install yarn + run: npm install -g yarn - name: Install dependencies run: yarn install - - name: Setup QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: linux/arm64 - name: Prepare & build run: | - docker run --rm \ - -e CMAKE_BUILD_PARALLEL_LEVEL=${{ env.CMAKE_BUILD_PARALLEL_LEVEL }} \ - -v $(pwd):/${{ github.workspace }} \ - -w /${{ github.workspace }} \ - --platform linux/arm64 \ - arm64v8/ubuntu:latest \ - bash -c "./scripts/prepare-linux.sh && ./scripts/build-linux.sh" + bash ./scripts/prepare-linux.sh + bash ./scripts/build-linux.sh - name: Upload build artifacts if: github.event.inputs.upload-artifacts == 'YES' || inputs.upload-artifacts == 'YES' uses: actions/upload-artifact@v4 diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh index 943f519..ccf4818 100755 --- a/scripts/build-linux.sh +++ b/scripts/build-linux.sh @@ -10,6 +10,6 @@ if [ $ARCH == "x86_64" ]; then yarn clean && yarn build-native yarn clean && yarn build-native --CDLLAMA_VULKAN=1 --CDVARIANT=vulkan else - yarn clean && yarn build-native - yarn clean && yarn build-native --CDLLAMA_VULKAN=1 --CDVULKAN_SDK="$(realpath 'externals/arm64-Vulkan-SDK')" --CDVARIANT=vulkan + yarn clean && yarn build-native --CDGGML_NATIVE=OFF + yarn clean && yarn build-native --CDGGML_NATIVE=OFF --CDLLAMA_VULKAN=1 --CDVULKAN_SDK="$(realpath 'externals/arm64-Vulkan-SDK')" --CDVARIANT=vulkan fi