From 89b350227afb605a077d463a7980cfb074991b9e Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 27 Apr 2024 03:23:47 +0200 Subject: [PATCH 01/10] Update test.yaml Bump actions/checkout@v3 to v4 Bump action/setup-python@v4 to v5 --- .github/workflows/test.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6b0e7e8c6..292343c2b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,7 @@ jobs: with: submodules: "recursive" - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -40,11 +40,11 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "recursive" - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -63,11 +63,11 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "recursive" - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -83,11 +83,11 @@ jobs: # runs-on: ubuntu-latest # steps: - # - uses: actions/checkout@v3 + # - uses: actions/checkout@v4 # with: # submodules: "recursive" # - name: Set up Python 3.8 - # uses: actions/setup-python@v4 + # uses: actions/setup-python@v5 # with: # python-version: "3.8" # - name: Set up OpenCL & CLBlast @@ -110,11 +110,11 @@ jobs: runs-on: macos-13 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "recursive" - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.8" - name: Install dependencies From 7d899ef9238f0c889f7ed9c776728cece237dff6 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 27 Apr 2024 08:28:59 +0200 Subject: [PATCH 02/10] Update test-pypi.yaml Bum actions/setup-python@v4 to v5 --- .github/workflows/test-pypi.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index cc6a3a725..607ea2045 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -12,7 +12,7 @@ jobs: steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -32,7 +32,7 @@ jobs: steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -52,7 +52,7 @@ jobs: steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -61,4 +61,4 @@ jobs: python3 -m pip install --verbose llama-cpp-python[all] - name: Test with pytest run: | - python3 -c "import llama_cpp" \ No newline at end of file + python3 -c "import llama_cpp" From 7cdef54d6d61d38f9a6c45ac5ca0707e7c04af45 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sat, 27 Apr 2024 08:36:33 +0200 Subject: [PATCH 03/10] Update build-and-release.yaml Bump softprops/action-gh-release@v1 to v2 Bump actions/checkout@v3 to v4 Bump actions/setup-python@v3 to v5 --- .github/workflows/build-and-release.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 07742f1dc..17ecaf5b5 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -14,12 +14,12 @@ jobs: os: [ubuntu-20.04, windows-2019, macos-11] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "recursive" # Used to host cibuildwheel - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 with: python-version: "3.8" @@ -75,10 +75,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "recursive" - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 with: python-version: "3.8" - name: Install dependencies @@ -102,8 +102,8 @@ jobs: with: name: artifact path: dist - - uses: softprops/action-gh-release@v1 + - uses: softprops/action-gh-release@v2 with: files: dist/* env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1864daa2bf4913b5fbbf9a236716d6264a45a1d5 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 28 Apr 2024 06:16:27 +0200 Subject: [PATCH 04/10] Update publish.yaml Bump actions/checkout@v3 to v4 Bump actions/sertup-python@v4 to v5 --- .github/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 1afdd667d..bc4ec9063 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -10,11 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "recursive" - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.8" - name: Install dependencies From 3111f1a8d8beee2909578d0f1d7ba0a5ae0cb68e Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 28 Apr 2024 06:17:59 +0200 Subject: [PATCH 05/10] Update publish-to-test.yaml Bump actions/checkout@v3 to v4 Bump actions/setup-python @v4 to v5 --- .github/workflows/publish-to-test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-to-test.yaml b/.github/workflows/publish-to-test.yaml index 47e7c40b1..2bf0ea9ba 100644 --- a/.github/workflows/publish-to-test.yaml +++ b/.github/workflows/publish-to-test.yaml @@ -16,11 +16,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "recursive" - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.8" - name: Append Dev Version to __version__ @@ -40,4 +40,4 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository-url: https://test.pypi.org/legacy/ \ No newline at end of file + repository-url: https://test.pypi.org/legacy/ From c41136c0c0a89c0f2d2f3cc323ea0bcc7429027d Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 28 Apr 2024 06:19:21 +0200 Subject: [PATCH 06/10] Update test-pypi.yaml Add Python 3.12 --- .github/workflows/test-pypi.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-pypi.yaml b/.github/workflows/test-pypi.yaml index 607ea2045..aa8e8fa0b 100644 --- a/.github/workflows/test-pypi.yaml +++ b/.github/workflows/test-pypi.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -28,7 +28,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -48,7 +48,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} From 21e8b946e8adca5e5de6dc23418f5dcdba11b0de Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 28 Apr 2024 06:23:13 +0200 Subject: [PATCH 07/10] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 17ecaf5b5..b065d27bf 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -29,7 +29,7 @@ jobs: python -m pip install -e .[all] - name: Build wheels - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.17.0 env: # disable repair CIBW_REPAIR_WHEEL_COMMAND: "" @@ -55,7 +55,7 @@ jobs: platforms: linux/arm64 - name: Build wheels - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.17.0 env: CIBW_SKIP: "*musllinux* pp*" CIBW_REPAIR_WHEEL_COMMAND: "" From f9344f57398da92411f7a022d9937a1f4a57a5c2 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Sun, 28 Apr 2024 06:28:22 +0200 Subject: [PATCH 08/10] Update build-docker.yaml Bump docker/setup-qemu-action@v2 to v3 Bump docker/setup-buildx-action@v2 to v3 --- .github/workflows/build-docker.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 750b91e1f..4ebe3bb6d 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -12,18 +12,18 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: "recursive" - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -31,7 +31,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: "docker/simple/Dockerfile" From 4fafe7d717d13d2117875fc829ce3ae5960d6539 Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Mon, 29 Apr 2024 21:04:18 +0200 Subject: [PATCH 09/10] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index b065d27bf..ecef9db74 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -65,7 +65,7 @@ jobs: output-dir: wheelhouse/ - name: Upload wheels as artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: wheels-${{ matrix.version }} path: wheelhouse/*.whl From d9f59cb27ae483d031c780b857c0b50e0de96abf Mon Sep 17 00:00:00 2001 From: Olivier DEBAUCHE Date: Tue, 30 Apr 2024 01:16:16 +0200 Subject: [PATCH 10/10] Update build-and-release.yaml --- .github/workflows/build-and-release.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index ecef9db74..76bf708fe 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -62,13 +62,12 @@ jobs: CIBW_ARCHS: "aarch64" CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*" with: - output-dir: wheelhouse/ + output-dir: wheelhouse - name: Upload wheels as artifacts uses: actions/upload-artifact@v3 with: - name: wheels-${{ matrix.version }} - path: wheelhouse/*.whl + path: ./wheelhouse/*.whl build_sdist: name: Build source distribution