Skip to content

Commit

Permalink
Merged changes from main
Browse files Browse the repository at this point in the history
  • Loading branch information
vblagoje committed Sep 20, 2023
2 parents 026333f + bf6d306 commit e5b6369
Show file tree
Hide file tree
Showing 206 changed files with 2,662 additions and 2,420 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ Steps to reproduce the behavior
- [ ] Have you had a look at [our new FAQ page](https://docs.haystack.deepset.ai/docs/faq)?

**System:**
- OS:
- OS:
- GPU/CPU:
- Haystack version (commit or version number):
- Haystack version (commit or version number):
- DocumentStore:
- Reader:
- Retriever:
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'daily'
14 changes: 7 additions & 7 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
outputs:
cml_runner_id: ${{ steps.deploy.outputs.cml_runner_id }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: iterative/setup-cml@v1

- name: AWS authentication
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355
uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497
with:
aws-region: ${{ env.AWS_REGION }}
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
timeout-minutes: 2880

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Haystack + Datadog requirements
run: |
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
timeout-minutes: 2880

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Haystack + Datadog requirements
run: |
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
timeout-minutes: 2880

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Haystack + Datadog requirements
run: |
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
timeout-minutes: 2880

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Haystack + Datadog requirements
run: |
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: AWS authentication
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355
uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497
with:
aws-region: ${{ env.AWS_REGION }}
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/docker_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,28 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- 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 DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: $DOCKER_REPO_NAME

- name: Build base images
uses: docker/bake-action@v2
uses: docker/bake-action@v4
env:
IMAGE_TAG_SUFFIX: ${{ steps.meta.outputs.version }}
HAYSTACK_VERSION: ${{ steps.meta.outputs.version }}
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
[[ "$TORCH_INSTALLED" == "not found" ]] || echo "::error::Pytorch is installed in deepset/haystack:$TAG image for $PLATFORM"
- name: Build api images
uses: docker/bake-action@v2
uses: docker/bake-action@v4
env:
IMAGE_TAG_SUFFIX: ${{ steps.meta.outputs.version }}
BASE_IMAGE_TAG_SUFFIX: ${{ steps.meta.outputs.version }}
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
# For example, if the previous step builds `deepset/haystack:cpu-1.8.0`,
# this builds `deepset/haystack:cpu`
- name: Build api images no version in tag
uses: docker/bake-action@v2
uses: docker/bake-action@v4
if: steps.version.outputs.comparison-result == '>'
env:
IMAGE_TAG_SUFFIX: ${{ steps.meta.outputs.version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docstring_labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout base commit
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.base_ref }}

Expand All @@ -34,7 +34,7 @@ jobs:
echo "checksum=$CHECKSUM" >> "$GITHUB_OUTPUT"
- name: Checkout HEAD commit
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
# This must be set to correctly checkout a fork
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- ready_for_review
paths:
- "e2e/**/*.py"
- ".github/workflows/e2e.yml"

env:
PYTHON_VERSION: "3.8"
Expand All @@ -34,14 +35,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}

- name: Install dependencies
run: sudo apt install ffmpeg # for local Whisper tests
run: |
sudo apt-get update
sudo apt install ffmpeg # for local Whisper tests
- name: Run Elasticsearch
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- 9200:9200

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/imports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down
Loading

0 comments on commit e5b6369

Please sign in to comment.