Skip to content

Commit a30e9d7

Browse files
authored
Bump cmake version. Bump ubuntu version in the CI. (#505)
* ci: update ubuntu version The `ubuntu-20.04 (focal)` image is no longer supported, so the build using this image returns the following error: | This is a scheduled Ubuntu 20.04 brownout. Ubuntu 20.04 LTS runner | will be removed on 2025-04-01. See [1] for the details. This patch bumps the used version to the ubuntu-24.04 (noble). [1]: actions/runner-images#11101 Closes #504 Needed for tarantool/tarantool#11220 * ci: remove EOL Tarantool versions from testing This patch drops EOL Tarantool versions that have no package available for Ubuntu 24.04 noble at download.tarantool.org. * cmake: update the minimum required version For CMake 4.0, compatibility with versions of CMake older than 3.5 has been removed [1]. Thus, on macOS it leads to the error on build, since Homebrew updates it to version 4.0. This patch sets the minimum required version to 3.5 for now. [1]: https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features
1 parent 7a381cb commit a30e9d7

File tree

10 files changed

+16
-67
lines changed

10 files changed

+16
-67
lines changed

.github/workflows/destroy-deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- closed
99
jobs:
1010
destroy-deployment:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: actions/checkout@v4
1414
with:

.github/workflows/packaging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: |
1414
github.event_name == 'push' ||
1515
github.event.pull_request.head.repo.full_name != github.repository
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-24.04
1717
steps:
1818
- name: Check module version
1919
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
@@ -29,7 +29,7 @@ jobs:
2929
if: |
3030
github.event_name == 'push' ||
3131
github.event.pull_request.head.repo.full_name != github.repository
32-
runs-on: ubuntu-20.04
32+
runs-on: ubuntu-24.04
3333
needs: version-check
3434

3535
strategy:

.github/workflows/pull-translation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- '!master'
77
jobs:
88
pull-translations:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-24.04
1010

1111
steps:
1212
- uses: actions/checkout@v4

.github/workflows/push-translation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
# - 'doc/**/*'
88
jobs:
99
push-translation-sources:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- uses: actions/checkout@v4

.github/workflows/push_rockspec.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
version-check:
1818
# We need this job to run only on push with tag.
1919
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
20-
runs-on: [ ubuntu-20.04 ]
20+
runs-on: [ ubuntu-24.04 ]
2121
steps:
2222
- name: Check module version
2323
uses: tarantool/actions/check-module-version@master
@@ -27,7 +27,7 @@ jobs:
2727
require('test.rock_utils').assert_nonbuiltin('metrics')
2828
2929
push-scm-rockspec:
30-
runs-on: [ ubuntu-20.04 ]
30+
runs-on: [ ubuntu-24.04 ]
3131
if: github.ref == 'refs/heads/master' && github.event.workflow_run.conclusion == 'success'
3232
steps:
3333
- uses: actions/checkout@master
@@ -38,7 +38,7 @@ jobs:
3838
files: ${{ env.ROCK_NAME }}-scm-1.rockspec
3939

4040
push-tagged-rockspec:
41-
runs-on: [ ubuntu-20.04 ]
41+
runs-on: [ ubuntu-24.04 ]
4242
if: startsWith(github.ref, 'refs/tags')
4343
needs: version-check
4444
steps:

.github/workflows/reusable-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55
inputs:
66
artifact_name:
77
description: 'The name of the tarantool build artifact'
8-
default: ubuntu-focal
8+
default: ubuntu-noble
99
required: false
1010
type: string
1111

1212
jobs:
1313
run_tests:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- name: 'Clone the metrics module'
1717
uses: actions/checkout@v4

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
stale:
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-24.04
99
steps:
1010
- uses: actions/stale@v3
1111
with:

.github/workflows/test.yml

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -10,58 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
tarantool:
14-
- "1.10"
15-
- "2.2"
16-
- "2.3"
17-
- "2.4"
18-
- "2.5"
19-
- "2.6"
20-
- "2.7"
21-
- "2.8"
22-
cartridge:
23-
- ""
24-
- "1.2.0"
25-
- "2.1.2"
26-
- "2.4.0"
27-
- "2.5.1"
28-
- "2.6.0"
29-
- "2.7.9"
3013
include:
31-
# 1.10
32-
- tarantool: "1.10"
33-
cartridge: "2.8.6"
34-
- tarantool: "1.10"
35-
cartridge: "2.9.0"
36-
- tarantool: "1.10"
37-
cartridge: "2.10.0"
38-
- tarantool: "1.10"
39-
cartridge: "2.10.0"
40-
- tarantool: "1.10"
41-
cartridge: "2.11.0"
42-
- tarantool: "1.10"
43-
cartridge: "2.12.4"
44-
- tarantool: "1.10"
45-
cartridge: "2.13.0"
46-
# 2.10
47-
- tarantool: "2.10"
48-
cartridge: "2.7.9"
49-
- tarantool: "2.10"
50-
cartridge: "2.8.6"
51-
- tarantool: "2.10"
52-
cartridge: "2.9.0"
53-
- tarantool: "2.10"
54-
cartridge: "2.10.0"
55-
- tarantool: "2.10"
56-
cartridge: "2.10.0"
57-
- tarantool: "2.10"
58-
cartridge: "2.11.0"
59-
- tarantool: "2.10"
60-
cartridge: "2.12.4"
61-
- tarantool: "2.10"
62-
cartridge: "2.13.0"
63-
- tarantool: "2.10"
64-
cartridge: ""
6514
# 2.11
6615
- tarantool: "2.11"
6716
cartridge: "2.7.9"
@@ -88,7 +37,7 @@ jobs:
8837
cartridge: ""
8938
- tarantool: "3.3"
9039
cartridge: ""
91-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-24.04
9241
steps:
9342
- uses: actions/checkout@v4
9443

@@ -116,7 +65,7 @@ jobs:
11665
run: make test_with_coverage_report
11766

11867
packpack:
119-
runs-on: ubuntu-20.04
68+
runs-on: ubuntu-24.04
12069
needs: test
12170
steps:
12271
- uses: actions/checkout@v4
@@ -128,7 +77,7 @@ jobs:
12877
ls -l build/
12978
13079
promtool:
131-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-24.04
13281
strategy:
13382
matrix:
13483
tarantool:

.github/workflows/upload-translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
# - master
1010
jobs:
1111
autocommit-pot-files:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313

1414
steps:
1515

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.6 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22

33
project(metrics NONE)
44

0 commit comments

Comments
 (0)