Skip to content

Commit 5488839

Browse files
patapenka-alexeypatapenka-alexey
committed
ci: bump ubuntu version
Bump actions to use ubuntu-24.04 for fixing the following GitHub warning: The Ubuntu 20.04 Actions runner image will begin deprecation on 2025-02-01. Part of #TNTP-1918
1 parent b6422af commit 5488839

File tree

4 files changed

+82
-60
lines changed

4 files changed

+82
-60
lines changed

‎.github/workflows/packing.yml‎

Lines changed: 50 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
if: (github.event_name == 'push') ||
2121
(github.event_name == 'pull_request' &&
2222
github.event.pull_request.head.repo.full_name != github.repository)
23-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-24.04
2424

2525
strategy:
2626
fail-fast: false
2727

2828
steps:
2929
- name: Clone the connector repo
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
# Checkout all tags for correct version computation.
3232
with:
3333
fetch-depth: 0
@@ -65,14 +65,14 @@ jobs:
6565
if: (github.event_name == 'push') ||
6666
(github.event_name == 'pull_request' &&
6767
github.event.pull_request.head.repo.full_name != github.repository)
68-
runs-on: ubuntu-20.04
68+
runs-on: ubuntu-24.04
6969

7070
strategy:
7171
fail-fast: false
7272

7373
steps:
7474
- name: Clone the connector repo
75-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7676

7777
- name: Setup Python
7878
uses: actions/setup-python@v4
@@ -83,7 +83,7 @@ jobs:
8383
run: python3 .github/scripts/remove_source_code.py
8484

8585
- name: Install tarantool
86-
uses: tarantool/setup-tarantool@v2
86+
uses: tarantool/setup-tarantool@v3
8787
with:
8888
tarantool-version: '2.11'
8989

@@ -103,7 +103,8 @@ jobs:
103103
run: |
104104
curl -L https://tarantool.io/release/2/installer.sh | bash
105105
sudo apt install -y tt
106-
tt rocks install crud
106+
pip3 install cmake==3.15.3
107+
tt rocks install crud 1.4.2
107108
108109
- name: Run tests
109110
run: make test-pure-install
@@ -127,7 +128,7 @@ jobs:
127128

128129
steps:
129130
- name: Clone the connector repo
130-
uses: actions/checkout@v3
131+
uses: actions/checkout@v4
131132

132133
- name: Setup Python
133134
uses: actions/setup-python@v4
@@ -188,14 +189,14 @@ jobs:
188189
- run_tests_pip_package_linux
189190
- run_tests_pip_package_windows
190191

191-
runs-on: ubuntu-20.04
192+
runs-on: ubuntu-24.04
192193

193194
strategy:
194195
fail-fast: false
195196

196197
steps:
197198
- name: Clone the connector repo
198-
uses: actions/checkout@v3
199+
uses: actions/checkout@v4
199200

200201
- name: Setup Python and basic packing tools
201202
uses: actions/setup-python@v4
@@ -226,7 +227,7 @@ jobs:
226227
if: (github.event_name == 'push') ||
227228
(github.event_name == 'pull_request' &&
228229
github.event.pull_request.head.repo.full_name != github.repository)
229-
runs-on: ubuntu-20.04
230+
runs-on: ubuntu-24.04
230231

231232
container:
232233
image: ${{ matrix.target.os }}:${{ matrix.target.dist }}
@@ -250,7 +251,7 @@ jobs:
250251
run: dnf install -y git
251252

252253
- name: Clone the connector repo
253-
uses: actions/checkout@v3
254+
uses: actions/checkout@v4
254255
# Checkout all tags for correct version computation.
255256
with:
256257
fetch-depth: 0
@@ -293,7 +294,7 @@ jobs:
293294
if: (github.event_name == 'push') ||
294295
(github.event_name == 'pull_request' &&
295296
github.event.pull_request.head.repo.full_name != github.repository)
296-
runs-on: ubuntu-20.04
297+
runs-on: ubuntu-24.04
297298

298299
container:
299300
image: ${{ matrix.target.os }}:${{ matrix.target.dist }}
@@ -312,7 +313,7 @@ jobs:
312313

313314
steps:
314315
- name: Clone the connector repo
315-
uses: actions/checkout@v3
316+
uses: actions/checkout@v4
316317

317318
- name: Setup Python and test running tools
318319
# cmake rocks fail to install as expected without findutils:
@@ -343,7 +344,8 @@ jobs:
343344
run: |
344345
curl -L https://tarantool.io/release/2/installer.sh | bash
345346
sudo dnf install -y tt
346-
tt rocks install crud
347+
pip3 install cmake==3.15.3
348+
tt rocks install crud 1.4.2
347349
348350
- name: Run tests
349351
run: make test-pure-install
@@ -354,7 +356,7 @@ jobs:
354356
needs:
355357
- run_tests_rpm
356358

357-
runs-on: ubuntu-20.04
359+
runs-on: ubuntu-24.04
358360

359361
strategy:
360362
fail-fast: false
@@ -370,7 +372,7 @@ jobs:
370372

371373
steps:
372374
- name: Clone the connector repo
373-
uses: actions/checkout@v3
375+
uses: actions/checkout@v4
374376

375377
- name: Install tools for package publishing
376378
run: sudo apt install -y curl make
@@ -404,14 +406,14 @@ jobs:
404406
if: (github.event_name == 'push') ||
405407
(github.event_name == 'pull_request' &&
406408
github.event.pull_request.head.repo.full_name != github.repository)
407-
runs-on: ubuntu-20.04
409+
runs-on: ubuntu-22.04
408410

409411
strategy:
410412
fail-fast: false
411413

412414
steps:
413415
- name: Clone the connector repo
414-
uses: actions/checkout@v3
416+
uses: actions/checkout@v4
415417
# Checkout all tags for correct version computation
416418
with:
417419
fetch-depth: 0
@@ -453,7 +455,7 @@ jobs:
453455
if: (github.event_name == 'push') ||
454456
(github.event_name == 'pull_request' &&
455457
github.event.pull_request.head.repo.full_name != github.repository)
456-
runs-on: ubuntu-20.04
458+
runs-on: ubuntu-24.04
457459

458460
container:
459461
image: ${{ matrix.target.os }}:${{ matrix.target.dist }}
@@ -463,18 +465,18 @@ jobs:
463465

464466
matrix:
465467
target:
468+
# - os: debian
469+
# dist: bookworm # 12
466470
- os: ubuntu
467471
dist: focal # 20.04
468472
- os: ubuntu
469473
dist: jammy # 22.04
470-
- os: debian
471-
dist: buster # 10
472-
- os: debian
473-
dist: bullseye # 11
474+
# - os: ubuntu
475+
# dist: noble # 24.04
474476

475477
steps:
476478
- name: Clone the connector repo
477-
uses: actions/checkout@v3
479+
uses: actions/checkout@v4
478480

479481
- name: Prepare apt
480482
run: apt update
@@ -500,29 +502,49 @@ jobs:
500502
path: deb_dist
501503

502504
- name: Install the package from deb artifacts
505+
# https://github.com/yktoo/indicator-sound-switcher/issues/113#issuecomment-1243975728
506+
# apt install zstd
503507
run: apt install -y `pwd`/deb_dist/python3-tarantool_*.deb
504508
env:
505509
DEBIAN_FRONTEND: noninteractive
506510

507511
- name: Install test requirements
508512
run: pip3 install -r requirements-test.txt
513+
if: matrix.target.os == 'ubuntu'
514+
515+
- name: Install test requirements
516+
run: |
517+
apt install -y python3.11-venv
518+
python3 -m venv .venv
519+
.venv/bin/activate
520+
pip3 install -r requirements-test.txt
521+
if: matrix.target.os == 'debian'
509522

510523
- name: Install the crud module for testing purposes
511524
run: |
512525
curl -L https://tarantool.io/release/2/installer.sh | bash
513526
apt install -y tt
514-
tt rocks install crud
527+
pip3 install cmake==3.15.3
528+
tt rocks install crud 1.4.2
515529
516530
- name: Run tests
517-
run: make test-pure-install
531+
run: |
532+
make test-pure-install
533+
if: matrix.target.os == 'ubuntu'
534+
535+
- name: Run tests
536+
run: |
537+
source .venv/bin/activate
538+
make test-pure-install
539+
if: matrix.target.os == 'debian'
518540

519541
publish_deb:
520542
if: startsWith(github.ref, 'refs/tags')
521543

522544
needs:
523545
- run_tests_deb
524546

525-
runs-on: ubuntu-20.04
547+
runs-on: ubuntu-24.04
526548

527549
strategy:
528550
fail-fast: false
@@ -540,7 +562,7 @@ jobs:
540562

541563
steps:
542564
- name: Clone the connector repo
543-
uses: actions/checkout@v3
565+
uses: actions/checkout@v4
544566

545567
- name: Install tools for package publishing
546568
run: sudo apt install -y curl make

‎.github/workflows/reusable_testing.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
run_tests:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- name: Clone the tarantool-python connector
1717
uses: actions/checkout@v4
@@ -43,6 +43,7 @@ jobs:
4343
run: |
4444
curl -L https://tarantool.io/release/2/installer.sh | bash
4545
sudo apt install -y tt
46-
tt rocks install crud
46+
pip3 install cmake==3.15.3
47+
tt rocks install crud 1.4.2
4748
4849
- run: make test

0 commit comments

Comments
 (0)