Skip to content

Commit 9c8945f

Browse files
ci: bump versions
Add Tarantool 2.11, newest SDKs and Python 3.11. Reduce test matrices where possible.
1 parent ae0d7f7 commit 9c8945f

File tree

3 files changed

+29
-41
lines changed

3 files changed

+29
-41
lines changed

Diff for: .github/workflows/packing.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Python and basic packing tools
3232
uses: actions/setup-python@v4
3333
with:
34-
python-version: '3.10'
34+
python-version: '3.11'
3535

3636
- name: Install tools for packing and verification
3737
run: pip3 install wheel twine
@@ -73,7 +73,7 @@ jobs:
7373
- name: Setup Python
7474
uses: actions/setup-python@v4
7575
with:
76-
python-version: '3.10'
76+
python-version: '3.11'
7777

7878
- name: Remove connector source code
7979
run: python3 .github/scripts/remove_source_code.py
@@ -128,7 +128,7 @@ jobs:
128128
- name: Setup Python
129129
uses: actions/setup-python@v4
130130
with:
131-
python-version: '3.10'
131+
python-version: '3.11'
132132

133133
- name: Remove connector source code
134134
run: python3 .github/scripts/remove_source_code.py
@@ -196,7 +196,7 @@ jobs:
196196
- name: Setup Python and basic packing tools
197197
uses: actions/setup-python@v4
198198
with:
199-
python-version: '3.10'
199+
python-version: '3.11'
200200

201201
- name: Install tools for package publishing
202202
run: pip3 install twine

Diff for: .github/workflows/reusable_testing.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup python3 for tests
3232
uses: actions/setup-python@v4
3333
with:
34-
python-version: 3.7
34+
python-version: '3.11'
3535

3636
- name: Install connector requirements
3737
run: pip3 install -r requirements.txt

Diff for: .github/workflows/testing.yml

+24-36
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
- '3.8'
3434
- '3.9'
3535
- '3.10'
36+
- '3.11'
3637
msgpack-deps:
3738
# latest msgpack will be installed as a part of requirements.txt
3839
- ''
@@ -42,17 +43,17 @@ jobs:
4243
# "This page is taking too long to load." error. Thus we use
4344
# pairwise testing.
4445
include:
45-
- tarantool: '2.8'
46-
python: '3.10'
46+
- tarantool: '2.11'
47+
python: '3.11'
4748
msgpack-deps: 'msgpack-python==0.4.0'
48-
- tarantool: '2.8'
49-
python: '3.10'
49+
- tarantool: '2.11'
50+
python: '3.11'
5051
msgpack-deps: 'msgpack==0.5.0'
51-
- tarantool: '2.8'
52-
python: '3.10'
52+
- tarantool: '2.11'
53+
python: '3.11'
5354
msgpack-deps: 'msgpack==0.6.2'
54-
- tarantool: '2.8'
55-
python: '3.10'
55+
- tarantool: '2.11'
56+
python: '3.11'
5657
msgpack-deps: 'msgpack==1.0.4'
5758

5859
steps:
@@ -114,15 +115,15 @@ jobs:
114115
fail-fast: false
115116
matrix:
116117
tarantool:
117-
- bundle: 'bundle-1.10.11-0-gf0b0e7ecf-r470'
118-
path: ''
119-
- bundle: 'bundle-2.8.3-21-g7d35cd2be-r470'
120-
path: ''
121-
- bundle: 'bundle-2.10.0-1-gfa775b383-r486-linux-x86_64'
122-
path: ''
123-
- bundle: 'sdk-gc64-2.11.0-rc2-0-r557.linux.x86_64'
118+
- bundle: 'sdk-1.10.15-0-r563'
119+
path: 'release/linux/x86_64/1.10/'
120+
- bundle: 'sdk-2.8.4-0-r563'
121+
path: 'release/linux/x86_64/2.8/'
122+
- bundle: 'sdk-gc64-2.10.7-0-r563.linux.x86_64'
123+
path: 'release/linux/x86_64/2.10/'
124+
- bundle: 'sdk-gc64-2.11.0-0-r563.linux.x86_64'
124125
path: 'release/linux/x86_64/2.11/'
125-
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
126+
python: ['3.6', '3.11']
126127

127128
steps:
128129
- name: Clone the connector
@@ -169,8 +170,8 @@ jobs:
169170
source tarantool-enterprise/env.sh
170171
make test
171172
env:
172-
TEST_TNT_SSL: ${{ matrix.tarantool.bundle == 'bundle-2.10.0-1-gfa775b383-r486-linux-x86_64' ||
173-
matrix.tarantool.bundle == 'sdk-gc64-2.11.0-rc2-0-r557.linux.x86_64'}}
173+
TEST_TNT_SSL: ${{ matrix.tarantool.bundle == 'sdk-gc64-2.10.7-0-r563.linux.x86_64' ||
174+
matrix.tarantool.bundle == 'sdk-gc64-2.11.0-0-r563.linux.x86_64'}}
174175

175176
run_tests_pip_branch_install_linux:
176177
# We want to run on external PRs, but not on our own internal
@@ -191,10 +192,7 @@ jobs:
191192
- '2.11'
192193
python:
193194
- '3.6'
194-
- '3.7'
195-
- '3.8'
196-
- '3.9'
197-
- '3.10'
195+
- '3.11'
198196
steps:
199197
- name: Clone the connector repo
200198
uses: actions/checkout@v3
@@ -244,12 +242,10 @@ jobs:
244242
matrix:
245243
# Use reduced test matrix cause Windows pipelines are long.
246244
tarantool:
247-
- '1.10'
248-
- '2.8'
249-
- '2.10.0.g0a5ce0b9c-1'
245+
- '2.11.0.g247a9a418-1'
250246
python:
251247
- '3.6'
252-
- '3.10'
248+
- '3.11'
253249

254250
steps:
255251
- name: Clone the connector
@@ -271,15 +267,7 @@ jobs:
271267
with:
272268
distribution: Ubuntu-20.04
273269

274-
- name: Install tarantool ${{ matrix.tarantool }} for WSL (2.8 and older)
275-
if: (matrix.tarantool == '1.10') || (matrix.tarantool == '2.8')
276-
shell: wsl-bash_Ubuntu-20.04 {0}
277-
run: |
278-
curl -L https://tarantool.io/installer.sh | VER=${{ matrix.tarantool }} bash -s -- --type "release"
279-
sudo apt install -y tarantool tarantool-dev
280-
281270
- name: Install tarantool ${{ matrix.tarantool }} for WSL (2.10 and newer)
282-
if: (matrix.tarantool != '1.10') && (matrix.tarantool != '2.8')
283271
shell: wsl-bash_Ubuntu-20.04 {0}
284272
run: |
285273
curl -L https://tarantool.io/release/2/installer.sh | bash -s
@@ -324,10 +312,10 @@ jobs:
324312
matrix:
325313
# Use reduced test matrix cause Windows pipelines are long.
326314
tarantool:
327-
- '2.10.0.g0a5ce0b9c-1'
315+
- '2.11.0.g247a9a418-1'
328316
python:
329317
- '3.6'
330-
- '3.10'
318+
- '3.11'
331319
steps:
332320
- name: Clone the connector repo
333321
uses: actions/checkout@v3

0 commit comments

Comments
 (0)