Skip to content

Commit 2a3f08f

Browse files
committed
github-ci: could not find openssl while building
Fetching patch with bugfix of #6576 in tarantool. Fixes #49
1 parent e116d44 commit 2a3f08f

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

.github/workflows/testing.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
if: matrix.tarantool != 'brew' && matrix.tarantool != 'master'
199199

200200
- name: Install tarantool build dependencies
201-
run: brew install autoconf automake libtool [email protected]
201+
run: brew install autoconf automake libtool [email protected] git
202202
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
203203

204204
- name: Clone tarantool ${{ env.T_VERSION }}
@@ -214,6 +214,22 @@ jobs:
214214
fetch-depth: 0
215215
if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true'
216216

217+
- name: Patching tarantool 1.10.x for succesful build
218+
run: |
219+
# These steps fix the problem with tarantool build described in #6576
220+
git diff -p d83e190 ${T_SRCDIR}/src/trivia/util.h > fix.patch
221+
patch -p1 -R < fix.patch ${T_SRCDIR}/src/trivia/util.h
222+
if: contains(matrix.tarantool, '1.10.') && steps.cache.outputs.cache-hit != 'true'
223+
224+
- name: Patching tarantool 2.4.x 2.5.x 2.6.x for succesful build
225+
run: |
226+
# These steps fix the problem with tarantool build described in #6576
227+
touch temp
228+
echo '#include <stdalign.h>' > temp
229+
cat ${T_SRCDIR}/src/trivia/util.h >> temp
230+
cat temp > ${T_SRCDIR}/src/trivia/util.h
231+
if: matrix.runs-on == 'macos-11.0' && (contains(matrix.tarantool, '2.5.') || contains(matrix.tarantool, '2.4.') || contains(matrix.tarantool, '2.6.'))
232+
217233
- name: Build tarantool ${{ env.T_VERSION }} from sources
218234
run: |
219235
mkdir "${T_DESTDIR}"

0 commit comments

Comments
 (0)