From 8e7b1a923fa947f916ba8b595b332032a9e2b5fa Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 10 Feb 2026 14:12:18 -0500 Subject: [PATCH] need to update pkgxdev/setup, too --- .github/workflows/ci.yml | 4 ++-- .github/workflows/pkg-platform.yml | 8 +++---- .github/workflows/pkg.yml | 2 +- .github/workflows/restock.yml | 2 +- .../ggerganov/llama.cpp/package.yml | 21 +++++++++---------- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 090236833a..565dad5c42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: outputs: matrix: ${{ steps.process-diff.outputs.matrix }} steps: - - uses: pkgxdev/setup@v2 + - uses: pkgxdev/setup@v4 - run: pkgx --sync - uses: actions/checkout@v4 - uses: technote-space/get-diff-action@v6 @@ -63,7 +63,7 @@ jobs: p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }} APPLE_IDENTITY: ${{ github.repository == 'pkgxdev/pantry' && secrets.APPLE_IDENTITY || '-' }} - - uses: pkgxdev/setup@v2 + - uses: pkgxdev/setup@v4 with: PKGX_DIR: /opt - run: pkgx --sync diff --git a/.github/workflows/pkg-platform.yml b/.github/workflows/pkg-platform.yml index d3c56b3255..034a7720bc 100644 --- a/.github/workflows/pkg-platform.yml +++ b/.github/workflows/pkg-platform.yml @@ -80,7 +80,7 @@ jobs: p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }} APPLE_IDENTITY: ${{ secrets.APPLE_IDENTITY }} - - uses: pkgxdev/setup@v2 + - uses: pkgxdev/setup@v4 with: PKGX_DIR: /opt - run: pkgx --sync @@ -124,7 +124,7 @@ jobs: pacman -Sy --noconfirm archlinux-keyring fi - uses: ./.github/actions/setup - - uses: pkgxdev/setup@v2 + - uses: pkgxdev/setup@v4 - run: pkgx --sync - uses: pkgxdev/brewkit/download-build-artifact@v1 @@ -146,7 +146,7 @@ jobs: AWS: ${{ inputs.dry-run && 'echo' || 'aws' }} PREFIX: ${{ needs.build.outputs.project }}/${{ needs.build.outputs.platform }}/${{ needs.build.outputs.arch }}/v${{ needs.build.outputs.version }}.tar.${{ matrix.compression }} steps: - - uses: pkgxdev/setup@v2 + - uses: pkgxdev/setup@v4 - run: pkgx --sync - uses: actions/checkout@v4 @@ -258,7 +258,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - - uses: pkgxdev/setup@v2 + - uses: pkgxdev/setup@v4 - run: pkgx --sync - name: generate versions.txt diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index 726953b8de..7ada261701 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -24,7 +24,7 @@ jobs: matrix: ${{ steps.matrix.outputs.matrix }} pkg: ${{ steps.id.outputs.pkg-json }} steps: - - uses: pkgxdev/setup@v2 + - uses: pkgxdev/setup@v4 - run: pkgx --sync - uses: actions/checkout@v4 - run: .github/scripts/get-matrix.ts ${{ inputs.pkg }} diff --git a/.github/workflows/restock.yml b/.github/workflows/restock.yml index f8d516daa0..d03b250002 100644 --- a/.github/workflows/restock.yml +++ b/.github/workflows/restock.yml @@ -15,7 +15,7 @@ jobs: outputs: versions: ${{ steps.inventory.outputs.versions }} steps: - - uses: pkgxdev/setup@v2 + - uses: pkgxdev/setup@v4 - run: pkgx --sync - uses: actions/checkout@v4 - run: ./.github/scripts/inventory.ts ${{ inputs.project }} diff --git a/projects/github.com/ggerganov/llama.cpp/package.yml b/projects/github.com/ggerganov/llama.cpp/package.yml index 221416d0e2..6721d06dd4 100644 --- a/projects/github.com/ggerganov/llama.cpp/package.yml +++ b/projects/github.com/ggerganov/llama.cpp/package.yml @@ -19,21 +19,20 @@ platforms: # Illegal instruction: 4 on darwin/x86-64 dependencies: - pkgx.sh: ^1 + pkgx.sh: ">=1" curl.se: 8 # libcurl, since b5064 linux: - gnu.org/gcc/libstdcxx: '*' # clang doesn't provide omp.h, and we need libstdc++ + gnu.org/gcc/libstdcxx: 14 # clang doesn't provide omp.h, and we need libstdc++ + gnu.org/gcc: 14 # needs libgomp.so.1 build: dependencies: - gnu.org/coreutils: '*' - git-scm.org: '*' + gnu.org/coreutils: "*" + git-scm.org: "*" python.org: ~3.11 cmake.org: 3 - linux: - gnu.org/gcc: '*' linux/aarch64: - kernel.org/linux-headers: '*' # hwcap.h + kernel.org/linux-headers: "*" # hwcap.h env: VIRTUAL_ENV: ${{prefix}}/venv script: @@ -43,7 +42,7 @@ build: # this commit breaks linux/aarch64 - fixed in 1732 - run: curl -LSs 'https://github.com/ggerganov/llama.cpp/pull/4630/commits/42f5246effafddcf87d67656b58e95030f4bc454.patch' | patch -p1 -R - if: '>=1705<1732' + if: ">=1705<1732" # -mcpu=native doesn't work on our docker builders - run: sed -i -e's/-mcpu=native/-mcpu=generic/g' CMakeLists.txt working-directory: ggml/src/ggml-cpu @@ -66,7 +65,7 @@ build: - cmake -B build $CMAKE_ARGS - cmake --build build --config Release - cmake --install build --prefix {{prefix}} - if: '>=4242' + if: ">=4242" # https://github.com/ggerganov/llama.cpp/blob/master/examples/deprecation-warning/README.md - | @@ -130,10 +129,10 @@ test: - run: llama.cpp --help if: <2453 - run: llama.cpp --version - if: '>=2453<3368' + if: ">=2453<3368" # llama.cpp deprecated in v3368 - run: llama-cli --version - if: '>=3368' + if: ">=3368" # ^^ testing more than this requires downloading the models 😬 entrypoint: ./entrypoint.sh