Skip to content

Commit c72ab22

Browse files
committed
merge: resolve conflicts with main
Take LocalAI v3.12.1 and vLLM backend support from main. Update go.mod/go.sum to main's versions.
2 parents 33e3302 + e331af3 commit c72ab22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1978
-673
lines changed

.github/workflows/codeql.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Harden Runner
44-
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
44+
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
4545
with:
4646
disable-sudo: true
4747
egress-policy: audit
@@ -56,14 +56,14 @@ jobs:
5656
- name: Checkout repository
5757
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5858

59-
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
59+
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
6060
with:
61-
go-version: "1.24"
61+
go-version: "1.26"
6262
check-latest: true
6363

6464
# Initializes the CodeQL tools for scanning.
6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # v3.29.5
66+
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v3.29.5
6767
with:
6868
languages: ${{ matrix.language }}
6969
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -73,7 +73,7 @@ jobs:
7373
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
7474
# If this step fails, then you should remove it and run the build manually (see below)
7575
- name: Autobuild
76-
uses: github/codeql-action/autobuild@19b2f06db2b6f5108140aeb04014ef02b648f789 # v3.29.5
76+
uses: github/codeql-action/autobuild@0d579ffd059c29b07949a3cce3983f0780820c98 # v3.29.5
7777

7878
# ℹ️ Command-line programs to run using the OS shell.
7979
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -86,6 +86,6 @@ jobs:
8686
# ./location_of_script_within_repo/buildscript.sh
8787

8888
- name: Perform CodeQL Analysis
89-
uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # v3.29.5
89+
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v3.29.5
9090
with:
9191
category: "/language:${{matrix.language}}"

.github/workflows/daily-test-improver.lock.yml

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
20+
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
2121
with:
2222
disable-sudo: true
2323
egress-policy: audit
@@ -31,4 +31,4 @@ jobs:
3131
- name: 'Checkout Repository'
3232
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
- name: 'Dependency Review'
34-
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
34+
uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0

.github/workflows/deploy-docs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3030

3131
- name: Harden Runner
32-
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76
32+
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc
3333
with:
3434
disable-sudo: true
3535
egress-policy: audit
@@ -40,7 +40,7 @@ jobs:
4040
*.blob.core.windows.net:443
4141
4242
- name: Setup Node
43-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
43+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
4444
with:
4545
node-version: 20.x
4646

@@ -49,7 +49,7 @@ jobs:
4949
run: echo "dir=$(yarn cache dir)" > $GITHUB_OUTPUT
5050

5151
- name: Cache dependencies
52-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
52+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
5353
with:
5454
path: ${{ steps.yarn-cache.outputs.dir }}
5555
key: ${{ runner.os }}-website-${{ hashFiles('**/yarn.lock') }}

0 commit comments

Comments
 (0)