Skip to content

Commit 574d757

Browse files
committed
Merge branch 'main' to reconcile with the out-of-range guard from deepset-ai#12061
2 parents d6a8462 + 757b3e2 commit 574d757

1,429 files changed

Lines changed: 180684 additions & 24708 deletions

File tree

Some content is hidden

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

.clusterfuzzlite/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Pinned by digest for supply-chain integrity. Bump periodically (the OSS-Fuzz
77
# base-builder is updated frequently with toolchain fixes); resolve a fresh digest with:
88
# docker buildx imagetools inspect gcr.io/oss-fuzz-base/base-builder-python:latest --format '{{.Manifest.Digest}}'
9-
FROM gcr.io/oss-fuzz-base/base-builder-python@sha256:6768b69b56e3c6e654742e5109559fc37601b45d0cfe2e15ecb8e14f0e941a57
9+
FROM gcr.io/oss-fuzz-base/base-builder-python@sha256:662ca248430ff29e82f3505caa17e3b75f118243a41cfa42ae64fd24ef6365f0
1010

1111
COPY . $SRC/haystack
1212
WORKDIR $SRC/haystack

.clusterfuzzlite/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
# Builds the Atheris fuzz targets for ClusterFuzzLite / OSS-Fuzz.
77
# `compile_python_fuzzer` is provided by the base-builder-python image.
88

9-
pip3 install .
9+
python3 -m pip install --upgrade pip
10+
pip3 install . --uploaded-prior-to=P1D
1011

1112
for harness in "$SRC"/haystack/test/fuzz/fuzz_*.py; do
1213
name=$(basename "$harness" .py)

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Exclude the Docusaurus documentation site from GitHub's language statistics
2+
# (github-linguist). Otherwise the ~5,700 .mdx files there dominate the count
3+
# and the repo is misclassified as MDX instead of Python.
4+
# See: https://github.com/github-linguist/linguist/blob/main/docs/troubleshooting.md
5+
docs-website/** linguist-documentation

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ updates:
66
interval: 'daily'
77
cooldown:
88
default-days: 1
9+
groups:
10+
codeql:
11+
patterns:
12+
- 'github/codeql-action/*'
913

1014
- package-ecosystem: 'pip'
1115
directory: '/'

.github/utils/promote_unstable_docs_docusaurus.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323
sys.exit("Version must be formatted like so <major>.<minor>")
2424

2525
target_version = f"{args.version}" # e.g., "2.20" - the target release version
26-
major, minor = args.version.split(".")
2726

2827
target_unstable = f"{target_version}-unstable" # e.g., "2.20-unstable"
29-
previous_stable = f"{major}.{int(minor) - 1}" # e.g., "2.19" - previous stable release
3028

3129
versions = [
3230
folder.replace("version-", "")
@@ -83,9 +81,15 @@
8381
with open("docs-website/reference_versions.json", "w") as f:
8482
json.dump(reference_versions_list, f)
8583

86-
# in docusaurus.config.js, replace previous stable version with the target version
84+
# in docusaurus.config.js, replace the current stable version (lastVersion) with the target version
8785
with open("docs-website/docusaurus.config.js") as f:
8886
config = f.read()
87+
last_version_matches = set(re.findall(r"lastVersion: '([^']+)'", config))
88+
if not last_version_matches:
89+
sys.exit("Could not find any lastVersion entry in docusaurus.config.js")
90+
if len(last_version_matches) > 1:
91+
sys.exit(f"Found inconsistent lastVersion entries in docusaurus.config.js: {last_version_matches}")
92+
previous_stable = last_version_matches.pop() # e.g., "2.19" - previous stable release
8993
config = config.replace(f"lastVersion: '{previous_stable}'", f"lastVersion: '{target_version}'") # "2.19" -> "2.20"
9094
with open("docs-website/docusaurus.config.js", "w") as f:
9195
f.write(config)

.github/workflows/branch_off.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout this repo
23-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
23+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2424
with:
2525
ref: main
2626
# Persist the bot token so the branch/tag pushes below authenticate as
@@ -58,11 +58,11 @@ jobs:
5858
git tag "v${{ steps.versions.outputs.next_version_rc0 }}" -m "v${{ steps.versions.outputs.next_version_rc0 }}"
5959
git push --tags
6060
61-
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
61+
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
6262
with:
6363
python-version: "${{ env.PYTHON_VERSION }}"
6464

65-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
65+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
6666
with:
6767
node-version: "22"
6868

.github/workflows/check_api_ref.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
test-api-reference-build:
1414
runs-on: ubuntu-slim
1515
steps:
16-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
16+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1717
with:
1818
persist-credentials: false
1919
fetch-depth: 0
2020

2121
- name: Set up Python
22-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
22+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
2323
with:
2424
python-version: "3.13"
2525

@@ -79,7 +79,7 @@ jobs:
7979

8080
- name: Set up Node.js
8181
if: steps.changed.outputs.needs_check == 'true'
82-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
82+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
8383
with:
8484
node-version: "22"
8585

0 commit comments

Comments
 (0)