Skip to content

Commit 4bc7475

Browse files
patapenka-alexeypatapenka-alexey
committed
ci: bump actions to use ubuntu-24.04
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. Tarantool pre-build version has been increased to 2.11 because `installer.sh` version 1.10 does not support Ubuntu `noble`. Update CMake minumum version to prevent warnings about too old CMake version during build configuring under Ubuntu 22/24. Remove too old distros and unsupported tarantool versions from tests. Part of #TNTP-1918
1 parent 11c3aea commit 4bc7475

File tree

7 files changed

+44
-85
lines changed

7 files changed

+44
-85
lines changed

‎.github/workflows/packaging.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: |
1111
github.event_name == 'push' ||
1212
github.event.pull_request.head.repo.full_name != github.repository
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- name: Check module version
1616
# We need this step to run only on push with tag.
@@ -32,26 +32,27 @@ jobs:
3232
matrix:
3333
platform:
3434
- {os: debian, dist: bullseye}
35+
- {os: debian, dist: bookworm}
3536
- {os: ubuntu, dist: focal}
3637
- {os: ubuntu, dist: jammy}
37-
- {os: centos, dist: 7}
38+
- {os: ubuntu, dist: noble}
3839
- {os: centos, dist: 8}
3940
- {os: fedora, dist: 34}
4041
- {os: fedora, dist: 35}
4142
- {os: fedora, dist: 36}
4243

43-
runs-on: ubuntu-latest
44+
runs-on: ubuntu-24.04
4445
steps:
4546
- name: Clone the module
46-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4748
with:
4849
# fetch-depth is 1 by default and it is okay for
4950
# building from a tag. However it is convenient to
5051
# have correct version for builds between tags too.
5152
fetch-depth: 0
5253

5354
- name: Clone packpack
54-
uses: actions/checkout@v3
55+
uses: actions/checkout@v4
5556
with:
5657
repository: packpack/packpack
5758
path: packpack
@@ -62,7 +63,7 @@ jobs:
6263
export DIST=${{ matrix.platform.dist }}
6364
./packpack/packpack
6465
65-
- uses: actions/upload-artifact@v3
66+
- uses: actions/upload-artifact@v4
6667
with:
6768
name: ${{ format('{0}-{1}', matrix.platform.os, matrix.platform.dist) }}
6869
path: build
@@ -82,11 +83,10 @@ jobs:
8283
matrix:
8384
platform:
8485
- {os: debian, dist: bullseye}
85-
- {os: ubuntu, dist: focal}
86+
- {os: debian, dist: bookworm}
8687
- {os: ubuntu, dist: jammy}
87-
- {os: centos, dist: 7}
88+
- {os: ubuntu, dist: noble}
8889
- {os: centos, dist: 8}
89-
- {os: fedora, dist: 34}
9090
- {os: fedora, dist: 35}
9191
- {os: fedora, dist: 36}
9292
tarantool:
@@ -97,15 +97,17 @@ jobs:
9797
# executable and when the module falls back to the
9898
# system libcurl.
9999
- release/1.10.7
100-
- release/2.10.0
100+
- release/2.11.6
101101
exclude:
102102
# Tarantool 1.10.7 release is not supported on
103103
# debian:bullseye, ubuntu:jammy and fedora:34,35,36.
104104
- platform: {os: debian, dist: bullseye}
105105
tarantool: release/1.10.7
106+
- platform: {os: debian, dist: bookworm}
107+
tarantool: release/1.10.7
106108
- platform: {os: ubuntu, dist: jammy}
107109
tarantool: release/1.10.7
108-
- platform: {os: fedora, dist: 34}
110+
- platform: {os: ubuntu, dist: noble}
109111
tarantool: release/1.10.7
110112
- platform: {os: fedora, dist: 35}
111113
tarantool: release/1.10.7
@@ -118,7 +120,7 @@ jobs:
118120
# See https://github.com/packpack/packpack/issues/7
119121
DEBIAN_FRONTEND: noninteractive
120122

121-
runs-on: ubuntu-latest
123+
runs-on: ubuntu-24.04
122124
container: ${{ format('{0}:{1}', matrix.platform.os, matrix.platform.dist) }}
123125
steps:
124126
# {{{ Distibution specific quirks
@@ -196,7 +198,7 @@ jobs:
196198
# }}} Install tarantool
197199

198200
- name: Download the module package
199-
uses: actions/download-artifact@v3
201+
uses: actions/download-artifact@v4
200202
with:
201203
name: ${{ format('{0}-{1}', matrix.platform.os, matrix.platform.dist) }}
202204

@@ -223,7 +225,7 @@ jobs:
223225
if: matrix.platform.os == 'debian' || matrix.platform.os == 'ubuntu'
224226

225227
- name: Clone the module
226-
uses: actions/checkout@v3
228+
uses: actions/checkout@v4
227229

228230
- name: Run tests
229231
run: |

‎.github/workflows/publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
version-check:
1010
# We need this job to run only on push with tag.
1111
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Check module version
1515
uses: tarantool/actions/check-module-version@master
@@ -18,9 +18,9 @@ jobs:
1818

1919
publish-scm-1:
2020
if: github.ref == 'refs/heads/master'
21-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-24.04
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- uses: tarantool/rocks.tarantool.org/github-action@master
2525
with:
2626
auth: ${{ secrets.ROCKS_AUTH }}
@@ -29,9 +29,9 @@ jobs:
2929
publish-tag:
3030
if: startsWith(github.ref, 'refs/tags/')
3131
needs: version-check
32-
runs-on: ubuntu-20.04
32+
runs-on: ubuntu-24.04
3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535

3636
# Create a rockspec for the release.
3737
- run: printf '%s=%s\n' TAG "${GITHUB_REF##*/}" >> "${GITHUB_ENV}"
@@ -59,7 +59,7 @@ jobs:
5959
# LuaJIT's FFI and tarantool specific features are okay.
6060
#
6161
# [1]: https://github.com/luarocks/luarocks/wiki/Types-of-rocks
62-
- uses: tarantool/setup-tarantool@v2
62+
- uses: tarantool/setup-tarantool@v3
6363
with:
6464
tarantool-version: '1.10'
6565
- run: tarantoolctl rocks pack smtp-${{ env.TAG }}-1.rockspec

‎.github/workflows/reusable_testing.yml

Lines changed: 1 addition & 1 deletion
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 smtp module'
1717
uses: actions/checkout@v4

‎.github/workflows/testing.yml

Lines changed: 18 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -17,41 +17,24 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
tarantool:
20-
- release/1.10.7
21-
- release/1.10.8
22-
- release/1.10.9
23-
- release/1.10.10
24-
- release/2.4.1
25-
- release/2.4.2
26-
- release/2.4.3
27-
- release/2.5.1
28-
- release/2.5.2
29-
- release/2.5.3
30-
- release/2.6.1
31-
- release/2.6.2
32-
- release/2.6.3
33-
- release/2.7.1
34-
- release/2.7.2
35-
- release/2.8.1
36-
- release/2.10.0
37-
- live/1.10
38-
- live/2.6
39-
- live/2.7
40-
- live/2.8
41-
- live/2.9
42-
# Add an extra check or modify a system environment
20+
- release/1.10.14
21+
- release/2.11.6
22+
- release/3.2.1
23+
- release/3.3.0
24+
- release/3.3.1
25+
# Add an extra check or modify a system environment
4326
# on one job.
4427
include:
4528
# Applicable for: 2.6.3, 2.7.2+, 2.8.1+, 2.9+ (gh-4559).
4629
#
4730
# Verify that system's libcurl headers are not required.
48-
- tarantool: live/2.8
31+
- tarantool: release/3.2.1
4932
dont_install_system_libcurl_header: true
5033
# Applicable for: 2.6.3, 2.7.2+, 2.8.1+, 2.9+ (gh-4559).
5134
#
5235
# Verify that tarantool's libcurl headers are preferred
5336
# when the system provides them too.
54-
- tarantool: live/2.9
37+
- tarantool: release/3.3.0
5538
break_system_libcurl_header: true
5639

5740
env:
@@ -60,7 +43,7 @@ jobs:
6043
# See https://github.com/packpack/packpack/issues/7
6144
DEBIAN_FRONTEND: noninteractive
6245

63-
runs-on: ubuntu-20.04
46+
runs-on: ubuntu-22.04
6447
steps:
6548
- name: Export T_VERSION environment variable
6649
run: |
@@ -72,7 +55,7 @@ jobs:
7255
printf '%s=%s\n' T_VERSION "${T_VERSION}" >> "${GITHUB_ENV}"
7356
7457
- name: Install tarantool ${{ matrix.tarantool }}
75-
uses: tarantool/setup-tarantool@v2
58+
uses: tarantool/setup-tarantool@v3
7659
with:
7760
tarantool-version: '${{ env.T_VERSION }}'
7861
nightly-build: ${{ startsWith(matrix.tarantool, 'live/') }}
@@ -101,7 +84,7 @@ jobs:
10184
if: matrix.break_system_libcurl_header
10285

10386
- name: Clone the module
104-
uses: actions/checkout@v3
87+
uses: actions/checkout@v4
10588

10689
- name: Build the module
10790
run: cmake . && make
@@ -121,27 +104,12 @@ jobs:
121104
fail-fast: false
122105
matrix:
123106
runs-on:
124-
- macos-11
125-
- macos-12
107+
- macos-13
126108
tarantool:
127109
- brew
128-
- 1.10.7
129-
- 1.10.8
130-
- 1.10.9
131-
- 1.10.10
132-
- 2.4.1
133-
- 2.4.2
134-
- 2.4.3
135-
- 2.5.1
136-
- 2.5.2
137-
- 2.5.3
138-
- 2.6.1
139-
- 2.6.2
140-
- 2.6.3
141-
- 2.7.1
142-
- 2.7.2
143-
- 2.8.1
144-
- 2.10.0
110+
- 1.10.15
111+
- 2.11.6
112+
- 3.3.1
145113
- master
146114

147115
env:
@@ -161,7 +129,7 @@ jobs:
161129
if: matrix.tarantool == 'brew'
162130

163131
- name: Cache built tarantool ${{ env.T_VERSION }}
164-
uses: actions/cache@v3
132+
uses: actions/cache@v4
165133
id: cache
166134
with:
167135
path: ${{ env.T_DESTDIR }}
@@ -184,7 +152,7 @@ jobs:
184152
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
185153

186154
- name: Clone tarantool ${{ env.T_VERSION }}
187-
uses: actions/checkout@v3
155+
uses: actions/checkout@v4
188156
with:
189157
repository: tarantool/tarantool
190158
ref: ${{ env.T_VERSION }}
@@ -196,17 +164,6 @@ jobs:
196164
fetch-depth: 0
197165
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
198166

199-
- name: Patching tarantool for successful build
200-
run: |
201-
cd "${T_SRCDIR}"
202-
# These steps fix the problem with tarantool build described in
203-
# https://github.com/tarantool/tarantool/issues/6576
204-
git show 11e87877df9001a4972019328592d79d55d1bb01 | patch -p1 -f
205-
if: matrix.tarantool != 'brew' &&
206-
matrix.tarantool != 'master' &&
207-
matrix.tarantool != '2.10.0' &&
208-
steps.cache.outputs.cache-hit != 'true'
209-
210167
- name: Build tarantool ${{ env.T_VERSION }} from sources
211168
run: |
212169
mkdir "${T_DESTDIR}"
@@ -270,7 +227,7 @@ jobs:
270227
if: matrix.tarantool != 'brew' && matrix.tarantool != 'master'
271228

272229
- name: Clone the module
273-
uses: actions/checkout@v3
230+
uses: actions/checkout@v4
274231
with:
275232
path: ${{ env.SRCDIR }}
276233

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
22

33
project(smtp C)
44

‎debian/prebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
curl -LsSf https://www.tarantool.io/release/1.10/installer.sh | sudo bash
1+
curl -LsSf https://www.tarantool.io/release/2.11/installer.sh | sudo bash
22

33
# Workaround https://github.com/tarantool/installer.sh/issues/10
44
printf '%s\n' 'Package: tarantool-dev' | sudo tee /etc/apt/preferences.d/tarantool-dev

‎rpm/prebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
curl -LsSf https://www.tarantool.io/release/1.10/installer.sh | sudo bash
1+
curl -LsSf https://www.tarantool.io/release/2.11/installer.sh | sudo bash

0 commit comments

Comments
 (0)