Skip to content

Commit d33a3c2

Browse files
authored
Merge pull request #610 from ClearcodeHQ/new-elastics
Run tests against newer elasticsearch versions
2 parents ae3eafe + c7a100e commit d33a3c2

File tree

2 files changed

+25
-41
lines changed

2 files changed

+25
-41
lines changed

.github/workflows/tests.yml

Lines changed: 24 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,7 @@ on:
77
branches: [ main ]
88

99
jobs:
10-
tests_8_9:
11-
runs-on: ubuntu-latest
12-
strategy:
13-
fail-fast: true
14-
matrix:
15-
python-version: [3.8, 3.9, "3.10", "3.11", "3.12", pypy-3.9]
16-
env:
17-
OS: ubuntu-latest
18-
PYTHON: ${{ matrix.python-version }}
19-
ES_JAVA_OPTS: "-Xms256m -Xmx512m"
20-
steps:
21-
- uses: actions/checkout@v4
22-
- uses: ./.github/actions/pytest
23-
with:
24-
python-version: ${{ matrix.python-version }}
25-
elasticsearch: "8.9"
26-
tests_8_8:
27-
needs: [tests_8_9]
10+
tests_8_12:
2811
runs-on: ubuntu-latest
2912
strategy:
3013
fail-fast: true
@@ -39,14 +22,14 @@ jobs:
3922
- uses: ./.github/actions/pytest
4023
with:
4124
python-version: ${{ matrix.python-version }}
42-
elasticsearch: "8.8"
43-
tests_8_7:
44-
needs: [tests_8_8]
25+
elasticsearch: "8.12"
26+
tests_8_11:
27+
needs: [tests_8_12]
4528
runs-on: ubuntu-latest
4629
strategy:
4730
fail-fast: true
4831
matrix:
49-
python-version: [3.9, "3.10", "3.11", "3.12"]
32+
python-version: [3.9, "3.10", "3.11", "3.12", pypy-3.9]
5033
env:
5134
OS: ubuntu-latest
5235
PYTHON: ${{ matrix.python-version }}
@@ -56,14 +39,14 @@ jobs:
5639
- uses: ./.github/actions/pytest
5740
with:
5841
python-version: ${{ matrix.python-version }}
59-
elasticsearch: "8.6"
60-
tests_8_6:
61-
needs: [tests_8_7]
42+
elasticsearch: "8.11"
43+
tests_8_10:
44+
needs: [tests_8_11]
6245
runs-on: ubuntu-latest
6346
strategy:
6447
fail-fast: true
6548
matrix:
66-
python-version: ["3.10", "3.11", "3.12"]
49+
python-version: ["3.10", "3.11", "3.12", pypy-3.9]
6750
env:
6851
OS: ubuntu-latest
6952
PYTHON: ${{ matrix.python-version }}
@@ -73,14 +56,14 @@ jobs:
7356
- uses: ./.github/actions/pytest
7457
with:
7558
python-version: ${{ matrix.python-version }}
76-
elasticsearch: "8.6"
77-
tests_8_5:
78-
needs: [tests_8_7]
59+
elasticsearch: "8.10"
60+
tests_8_9:
61+
needs: [tests_8_10]
7962
runs-on: ubuntu-latest
8063
strategy:
8164
fail-fast: true
8265
matrix:
83-
python-version: ["3.10", "3.11", "3.12"]
66+
python-version: ["3.12"]
8467
env:
8568
OS: ubuntu-latest
8669
PYTHON: ${{ matrix.python-version }}
@@ -90,14 +73,14 @@ jobs:
9073
- uses: ./.github/actions/pytest
9174
with:
9275
python-version: ${{ matrix.python-version }}
93-
elasticsearch: "8.5"
94-
tests_8_4:
95-
needs: [tests_8_7]
76+
elasticsearch: "8.9"
77+
tests_8_8:
78+
needs: [tests_8_10]
9679
runs-on: ubuntu-latest
9780
strategy:
9881
fail-fast: true
9982
matrix:
100-
python-version: ["3.11", "3.12"]
83+
python-version: ["3.12"]
10184
env:
10285
OS: ubuntu-latest
10386
PYTHON: ${{ matrix.python-version }}
@@ -107,14 +90,14 @@ jobs:
10790
- uses: ./.github/actions/pytest
10891
with:
10992
python-version: ${{ matrix.python-version }}
110-
elasticsearch: "8.4"
111-
tests_8_3:
112-
needs: [tests_8_7]
93+
elasticsearch: "8.8"
94+
tests_8_7:
95+
needs: [tests_8_10]
11396
runs-on: ubuntu-latest
11497
strategy:
11598
fail-fast: true
11699
matrix:
117-
python-version: ["3.11", "3.12"]
100+
python-version: ["3.12"]
118101
env:
119102
OS: ubuntu-latest
120103
PYTHON: ${{ matrix.python-version }}
@@ -124,9 +107,9 @@ jobs:
124107
- uses: ./.github/actions/pytest
125108
with:
126109
python-version: ${{ matrix.python-version }}
127-
elasticsearch: "8.3"
110+
elasticsearch: "8.7"
128111
tests_8_0:
129-
needs: [tests_8_7]
112+
needs: [tests_8_10]
130113
runs-on: ubuntu-latest
131114
strategy:
132115
fail-fast: true
@@ -147,7 +130,7 @@ jobs:
147130
strategy:
148131
fail-fast: true
149132
matrix:
150-
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
133+
python-version: ["3.10", "3.11", "3.12"]
151134
env:
152135
OS: ubuntu-latest
153136
PYTHON: ${{ matrix.python-version }}

newsfragments/610.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Run tests on CI Against Elasticsearch 8.12, 8.11 and 8.10

0 commit comments

Comments
 (0)