Skip to content

Commit 752c374

Browse files
committed
ci: actualize osx testing workflow
This patch fixes a bunch of problems: * Updates macOS runners, since macos-11 and macos-12 are unsupported, so there is no such runner to pick up the job. * Updates the list of Tarantool versions. * Bumps the `actions/cache` up to v4, since v2 is deprecated. * Bumps the `actions/checkout` up to v4, since v2 is deprecated. * Adds use of `actions/setup-python` of v5, to fixate the python 3.10 for tests. * Drops patching step, since it is not needed anymore and causes conflicts.
1 parent 239b9d6 commit 752c374

File tree

1 file changed

+12
-38
lines changed

1 file changed

+12
-38
lines changed

.github/workflows/osx_testing.yml

+12-38
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,12 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
runs-on:
21-
- macos-11
22-
- macos-12
21+
- macos-13
2322
tarantool:
24-
# TODO: add 1.10 versions after resolving gh-159.
2523
- brew
26-
- 2.4.1
27-
- 2.4.2
28-
- 2.4.3
29-
- 2.5.1
30-
- 2.5.2
31-
- 2.5.3
32-
- 2.6.1
33-
- 2.6.2
34-
- 2.6.3
35-
- 2.7.1
36-
- 2.7.2
37-
- 2.8.1
24+
- 2.11.6
25+
- 3.2.1
26+
- 3.3.1
3827
- master
3928

4029
env:
@@ -53,20 +42,16 @@ jobs:
5342
run: brew install tarantool
5443
if: matrix.tarantool == 'brew'
5544

45+
- name: Setup python3 for tests
46+
uses: actions/setup-python@v5
47+
with:
48+
python-version: '3.10'
49+
5650
- name: Cache built tarantool ${{ env.T_VERSION }}
57-
uses: actions/cache@v2
51+
uses: actions/cache@v4
5852
id: cache
5953
with:
6054
path: ${{ env.T_DESTDIR }}
61-
# v2 is due to https://github.com/actions/cache/issues/2
62-
# and because the cache keys without -v2 may contain
63-
# debug tarantool builds. It is desirable to have all
64-
# build either debug or release (RelWithDebInfo), but
65-
# we unable to build all releases in debug (see below).
66-
#
67-
# v3 is to re-verify all Mac OS builds after fix for the
68-
# gh-6076 problem (see below).
69-
#
7055
# v4 added due to inability to clear the cache after v3 prefix.
7156
# See https://github.com/github/docs/issues/14145
7257
key: ${{ matrix.runs-on }}-${{ matrix.tarantool }}-v4
@@ -77,7 +62,7 @@ jobs:
7762
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
7863

7964
- name: Clone tarantool ${{ env.T_VERSION }}
80-
uses: actions/checkout@v2
65+
uses: actions/checkout@v4
8166
with:
8267
repository: tarantool/tarantool
8368
ref: ${{ env.T_VERSION }}
@@ -89,17 +74,6 @@ jobs:
8974
fetch-depth: 0
9075
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
9176

92-
- name: Patching tarantool for successful build
93-
run: |
94-
cd "${T_SRCDIR}"
95-
# These steps fix the problem with tarantool build described in
96-
# https://github.com/tarantool/tarantool/issues/6576
97-
#
98-
# -f is added to fix tarantool build on Mac OS
99-
# See https://github.com/tarantool/smtp/commit/c771f3f17bf74d2bc7c979e78e15c48225b97015
100-
git show 11e87877df9001a4972019328592d79d55d1bb01 | patch -p1 -f
101-
if: matrix.tarantool != 'brew' && matrix.tarantool != 'master' && steps.cache.outputs.cache-hit != 'true'
102-
10377
- name: Build tarantool ${{ env.T_VERSION }} from sources
10478
run: |
10579
mkdir "${T_DESTDIR}"
@@ -163,7 +137,7 @@ jobs:
163137
if: matrix.tarantool != 'brew' && matrix.tarantool != 'master'
164138

165139
- name: Clone the connector
166-
uses: actions/checkout@v2
140+
uses: actions/checkout@v4
167141
with:
168142
path: ${{ env.SRCDIR }}
169143
# Needed because of tarantool-c dependence on submodules

0 commit comments

Comments
 (0)