Skip to content

Commit 67ed9d1

Browse files
authored
Fix tutorial testing workflow (#348)
* Fix tutorials for Haystack 2 testing workflow * Trigger CI for testing * Remove some common dependencies * Update some actions versions * Fix testing v1 tutorials * Trigger CI * More fixes * Fix version variable * Revert "Trigger CI for testing" This reverts commit 18b309c. * Revert "Trigger CI" This reverts commit dfc9ea8.
1 parent bb373ce commit 67ed9d1

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

.github/workflows/dc_sync.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
2222

@@ -44,9 +44,9 @@ jobs:
4444

4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848

49-
- uses: actions/setup-python@v4
49+
- uses: actions/setup-python@v5
5050
with:
5151
python-version: "3.11"
5252

.github/workflows/full_dc_sync.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212

13-
- uses: actions/setup-python@v4
13+
- uses: actions/setup-python@v5
1414
with:
1515
python-version: "3.11"
1616

.github/workflows/nightly.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
matrix_v1: ${{ steps.generator.outputs.matrix_v1 }}
1313
matrix_v2: ${{ steps.generator.outputs.matrix_v2 }}
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-python@v4
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-python@v5
1717
with:
1818
python-version: "3.11"
1919
- id: generator
@@ -57,7 +57,7 @@ jobs:
5757

5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v3
60+
uses: actions/checkout@v4
6161

6262
- name: Install dependencies
6363
# remove pip install pyzmq when this is resolved https://github.com/zeromq/pyzmq/issues/1764
@@ -115,7 +115,7 @@ jobs:
115115

116116
steps:
117117
- name: Checkout
118-
uses: actions/checkout@v3
118+
uses: actions/checkout@v4
119119

120120
- name: Install common dependencies
121121
run: |

.github/workflows/run_tutorials_v1.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
outputs:
3535
matrix: ${{ steps.filter.outputs.matrix }}
3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838

39-
- uses: actions/setup-python@v4
39+
- uses: actions/setup-python@v5
4040
with:
4141
python-version: "3.11"
4242

@@ -54,6 +54,7 @@ jobs:
5454
id: files
5555
uses: tj-actions/changed-files@v44
5656
with:
57+
matrix: true
5758
# We only want v1 tutorials, this is a necessary duplication
5859
files: |
5960
tutorials/01_Basic_QA_Pipeline.ipynb
@@ -90,9 +91,9 @@ jobs:
9091
matrix = json.loads(os.environ["MATRIX"])
9192
changed_files = json.loads(os.environ["CHANGED_FILES"])
9293
new_matrix = {"include": []}
93-
for item in matrix:
94+
for item in matrix["include"]:
9495
notebook = item["notebook"]
95-
if f"tutorials/{notebook}" not in changed_files:
96+
if f"tutorials/{notebook}.ipynb" not in changed_files:
9697
continue
9798
new_matrix["include"].append(item)
9899
@@ -102,8 +103,8 @@ jobs:
102103
103104
run-tutorials:
104105
runs-on: ubuntu-latest
105-
needs: get-latest-version
106-
container: deepset/haystack:base-cpu-${{ matrix.version }}
106+
needs: generate-matrix
107+
container: deepset/haystack:base-cpu-${{ matrix.haystack_version }}
107108

108109
strategy:
109110
fail-fast: false
@@ -137,7 +138,7 @@ jobs:
137138
pip install "datasets>=2.6.1"
138139
139140
- name: Checkout
140-
uses: actions/checkout@v3
141+
uses: actions/checkout@v4
141142

142143
# See https://github.com/actions/runner-images/issues/6775
143144
- name: Change Owner of Container Working Directory

.github/workflows/run_tutorials_v2.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
outputs:
3939
matrix: ${{ steps.filter.outputs.matrix }}
4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242

43-
- uses: actions/setup-python@v4
43+
- uses: actions/setup-python@v5
4444
with:
4545
python-version: "3.11"
4646

@@ -58,7 +58,7 @@ jobs:
5858
id: files
5959
uses: tj-actions/changed-files@v44
6060
with:
61-
json: true
61+
matrix: true
6262
files: tutorials/*.ipynb
6363
# Ignore all 1.x tutorials, we can remove this as soon as we drop support for it
6464
files_ignore: |
@@ -102,9 +102,9 @@ jobs:
102102
matrix = json.loads(os.environ["MATRIX"])
103103
changed_files = json.loads(os.environ["CHANGED_FILES"])
104104
new_matrix = {"include": []}
105-
for item in matrix:
105+
for item in matrix["include"]:
106106
notebook = item["notebook"]
107-
if f"tutorials/{notebook}" not in changed_files:
107+
if f"tutorials/{notebook}.ipynb" not in changed_files:
108108
continue
109109
new_matrix["include"].append(item)
110110
@@ -115,7 +115,7 @@ jobs:
115115
run-tutorials:
116116
runs-on: ubuntu-latest
117117
needs: generate-matrix
118-
container: deepset/haystack:base-${{ matrix.version }}
118+
container: deepset/haystack:base-${{ matrix.haystack_version }}
119119

120120
strategy:
121121
fail-fast: false
@@ -129,7 +129,7 @@ jobs:
129129

130130
steps:
131131
- name: Checkout
132-
uses: actions/checkout@v3
132+
uses: actions/checkout@v4
133133

134134
- name: Install common dependencies
135135
run: |
@@ -140,7 +140,6 @@ jobs:
140140
ffmpeg
141141
142142
pip install nbconvert ipython
143-
pip install "pyworld<=0.2.12" espnet espnet-model-zoo pydub
144143
145144
- name: Install tutorial dependencies
146145
if: toJSON(matrix.dependencies) != '[]'

.github/workflows/verify_generation.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

16-
- uses: actions/setup-python@v4
16+
- uses: actions/setup-python@v5
1717
with:
1818
python-version: "3.10"
1919

0 commit comments

Comments
 (0)