Skip to content

Commit ebd4867

Browse files
committed
Merge remote-tracking branch 'origin/main' into xx/foyer-v0.17.0
2 parents 92db85d + 953bd11 commit ebd4867

File tree

138 files changed

+3906
-1171
lines changed

Some content is hidden

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

138 files changed

+3906
-1171
lines changed

.github/actions/docker/action.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ description: "This action sets up Docker Buildx and authenticates to registries"
33
inputs:
44
ghcr-username:
55
description: "Github Container Registry username"
6-
required: true
6+
required: false
77
ghcr-password:
88
description: "Github Container Registry password"
9-
required: true
9+
required: false
1010
dockerhub-username:
1111
description: "DockerHub username"
1212
required: true
@@ -26,6 +26,7 @@ runs:
2626
uses: docker/setup-buildx-action@v2
2727
- name: Log in to the Github Container registry
2828
uses: docker/[email protected]
29+
if: ${{ inputs.ghcr-username != '' }}
2930
with:
3031
registry: ghcr.io
3132
username: ${{ inputs.ghcr-username }}
@@ -35,3 +36,6 @@ runs:
3536
with:
3637
username: ${{ inputs.dockerhub-username }}
3738
password: ${{ inputs.dockerhub-password }}
39+
- uses: useblacksmith/[email protected]
40+
with:
41+
setup-only: true

.github/workflows/_build_release_container.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ env:
3838
jobs:
3939
build:
4040
name: Build and publish container image
41-
runs-on: blacksmith-4vcpu-ubuntu-2204
41+
runs-on: blacksmith-16vcpu-ubuntu-2204
4242
steps:
4343
- name: Checkout
4444
uses: actions/checkout@v4
@@ -66,7 +66,8 @@ jobs:
6666
uses: useblacksmith/[email protected]
6767
with:
6868
context: .
69-
file: rust/cli/Dockerfile
69+
file: rust/Dockerfile
70+
target: cli
7071
platforms: ${{ env.PLATFORMS }}
7172
push: true
7273
build-args: |

.github/workflows/_go-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ jobs:
1515
uses: actions/checkout@v4
1616
- name: Setup
1717
uses: ./.github/actions/go
18-
- uses: useblacksmith/[email protected]
18+
- name: Set up Docker
19+
uses: ./.github/actions/docker
1920
with:
20-
setup-only: true
21+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
22+
dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN }}
2123
- uses: ./.github/actions/tilt
2224
- run: bin/cluster-test.sh bash -c 'cd go && make test'
2325
- name: Save service logs to artifact

.github/workflows/_python-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,11 @@ jobs:
179179
# languages: python
180180
# api_key: ${{ secrets.DD_API_KEY }}
181181
# site: ${{ vars.DD_SITE }}
182-
- uses: useblacksmith/[email protected]
182+
- name: Set up Docker
183+
uses: ./.github/actions/docker
183184
with:
184-
setup-only: true
185+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
186+
dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN }}
185187
- uses: ./.github/actions/tilt
186188
- name: Test
187189
run: bin/cluster-test.sh bash -c 'python -m pytest "${{ matrix.test-globs }}"' --durations 10

.github/workflows/_rust-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ jobs:
7676
uses: ./.github/actions/rust
7777
with:
7878
github-token: ${{ github.token }}
79-
- uses: useblacksmith/[email protected]
79+
- name: Set up Docker
80+
uses: ./.github/actions/docker
8081
with:
81-
setup-only: true
82+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
83+
dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN }}
8284
- name: Start services in Tilt
8385
uses: ./.github/actions/tilt
8486
- name: Build CLI

.github/workflows/pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ jobs:
191191
needs: change-detection
192192
if: contains(fromJson(needs.change-detection.outputs.tests-to-run), 'go')
193193
uses: ./.github/workflows/_go-tests.yml
194+
secrets: inherit
194195

195196
check-title:
196197
name: Check PR Title

.github/workflows/release-chromadb.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
go-tests:
6262
name: Go tests
6363
uses: ./.github/workflows/_go-tests.yml
64+
secrets: inherit
6465

6566
release-docker:
6667
name: Publish to DockerHub and GHCR

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ parquet = "52"
5454
prost = "0.13"
5555
prost-types = "0.13.5"
5656
regex = "1.11.1"
57-
regex_syntax = "0.8.5"
57+
regex-syntax = "0.8.5"
5858
roaring = "0.10.6"
5959
sea-query = "0.32"
6060
sea-query-binder = "0.7"

0 commit comments

Comments
 (0)