Skip to content

Commit 47f0e5d

Browse files
bigbesoleg-jukovec
authored andcommitted
ci: fix actions on macOS flows
* Removed unsupported macos-13 from CI actions. * Added new and supported by apple/github macos-15 and macos-26. * Removed tests for 1.10 for macOS since they won't even build on new versions of llvm that are shipped with macos-14 and newer ones. * Use actions-setup-cmake@v2 for new versions of macOS, since they are shipped with cmake 4.* or cmake 3.31, but supported cmake version for macOS is 3.29.x.
1 parent 871efa0 commit 47f0e5d

File tree

1 file changed

+5
-90
lines changed

1 file changed

+5
-90
lines changed

.github/workflows/testing.yml

Lines changed: 5 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,9 @@ jobs:
7575
- '1.20'
7676
- 'stable'
7777
runs-on:
78-
- macos-13
7978
- macos-14
80-
tarantool:
81-
- brew
82-
- 1.10.15
83-
exclude:
84-
- runs-on: macos-14
85-
tarantool: 1.10.15
79+
- macos-15
80+
- macos-26
8681

8782
env:
8883
# Make sense only for non-brew jobs.
@@ -101,92 +96,13 @@ jobs:
10196
with:
10297
path: ${{ env.SRCDIR }}
10398

104-
- name: Restore cache of tarantool ${{ env.T_VERSION }}
105-
uses: actions/cache@v4
106-
id: cache
99+
- name: Setup cmake
100+
uses: jwlawson/actions-setup-cmake@v2
107101
with:
108-
path: ${{ env.T_TARDIR }}
109-
key: ${{ matrix.runs-on }}-${{ matrix.tarantool }}
110-
if: matrix.tarantool != 'brew'
102+
cmake-version: '3.29.x'
111103

112104
- name: Install latest tarantool from brew
113105
run: brew install tarantool
114-
if: matrix.tarantool == 'brew'
115-
116-
- name: Install tarantool build dependencies
117-
run: brew install autoconf automake libtool openssl@1.1
118-
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
119-
120-
- name: Clone tarantool ${{ env.T_VERSION }}
121-
uses: actions/checkout@v5
122-
with:
123-
repository: tarantool/tarantool
124-
ref: ${{ env.T_VERSION }}
125-
path: ${{ env.T_TARDIR }}
126-
submodules: true
127-
# fetch-depth is 1 by default and it is okay for
128-
# building from a tag. However we have master in
129-
# the version list.
130-
fetch-depth: 0
131-
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
132-
133-
- name: Build tarantool ${{ env.T_VERSION }} from sources
134-
run: |
135-
cd "${T_TARDIR}"
136-
# Set RelWithDebInfo just to disable -Werror.
137-
#
138-
# There are tarantool releases on which AppleClang
139-
# complains about the problem that was fixed later in
140-
# https://github.com/tarantool/tarantool/commit/7e8688ff8885cc7813d12225e03694eb8886de29
141-
#
142-
# Set OpenSSL root directory for linking tarantool with OpenSSL of version 1.1
143-
# This is related to #49. There are too much deprecations which affect the build and tests.
144-
# Must be revisited after fixing https://github.com/tarantool/tarantool/issues/6477
145-
cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_DIST=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DOPENSSL_LIBRARIES=/usr/local/opt/openssl@1.1/lib
146-
# {{{ Workaround Mac OS build failure (gh-6076)
147-
#
148-
# https://github.com/tarantool/tarantool/issues/6076
149-
#
150-
# In brief: when "src/lib/small" is in include paths,
151-
# `#include <version>` from inside Mac OS SDK headers
152-
# attempts to include "src/lib/small/VERSION" as a
153-
# header file that leads to a syntax error.
154-
#
155-
# It was fixed in the following commits:
156-
#
157-
# * 1.10.10-24-g7bce4abd1
158-
# * 2.7.2-44-gbb1d32903
159-
# * 2.8.1-56-ga6c29c5af
160-
# * 2.9.0-84-gc5ae543f3
161-
#
162-
# However applying the workaround for all versions looks
163-
# harmless.
164-
#
165-
# Added -f just in case: I guess we'll drop this useless
166-
# obsoleted VERSION file from the git repository sooner
167-
# or later.
168-
rm -f src/lib/small/VERSION
169-
# The same as above, but for the VERSION file generated
170-
# by tarantool's CMake script.
171-
rm VERSION
172-
# }}} Workaround Mac OS build failure (gh-6076)
173-
# Continue the build.
174-
make -j$(sysctl -n hw.logicalcpu)
175-
make install
176-
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
177-
178-
- name: Install tarantool
179-
run: |
180-
cd "${T_TARDIR}"
181-
make install
182-
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit == 'true'
183-
184-
- name: Verify tarantool version
185-
run: |
186-
# Workaround https://github.com/tarantool/tarantool/issues/4983
187-
# Workaround https://github.com/tarantool/tarantool/issues/5040
188-
tarantool -e "require('fiber').sleep(0) assert(_TARANTOOL:startswith('${T_VERSION}'), _TARANTOOL) os.exit()"
189-
if: matrix.tarantool != 'brew' && matrix.tarantool != 'master'
190106

191107
- name: Setup golang for the connector and tests
192108
uses: actions/setup-go@v5
@@ -195,7 +111,6 @@ jobs:
195111

196112
# Workaround issue https://github.com/tarantool/tt/issues/640
197113
- name: Fix tt rocks
198-
if: matrix.tarantool == 'brew'
199114
run: |
200115
brew ls --verbose tarantool | grep macosx.lua | xargs rm -f
201116

0 commit comments

Comments
 (0)