From e437f800d86c476471ef66482c00517340ab9dac Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Tue, 16 Sep 2025 12:26:30 +0300 Subject: [PATCH 1/7] testing pr From dda17959b28a93d2866672ec553955edd494f0a5 Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Tue, 16 Sep 2025 12:32:07 +0300 Subject: [PATCH 2/7] update macos versions in ci --- .github/workflows/testing.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index f08aa9fc0..996a15d36 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -75,8 +75,9 @@ jobs: - '1.20' - 'stable' runs-on: - - macos-13 - macos-14 + - macos-15 + - macos-26 tarantool: - brew - 1.10.15 From 891368da0ae9882e75979c31674108f341f59908 Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Tue, 16 Sep 2025 13:05:26 +0300 Subject: [PATCH 3/7] install latest openssl --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 996a15d36..7b0cf4755 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -115,7 +115,7 @@ jobs: if: matrix.tarantool == 'brew' - name: Install tarantool build dependencies - run: brew install autoconf automake libtool openssl@1.1 + run: brew install autoconf automake libtool openssl if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true' - name: Clone tarantool ${{ env.T_VERSION }} From d4b8440f834f1b59e4bdec5323ff1c88751a4f17 Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Tue, 16 Sep 2025 13:12:39 +0300 Subject: [PATCH 4/7] print cmake version --- .github/workflows/testing.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7b0cf4755..793798ffe 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -102,6 +102,9 @@ jobs: with: path: ${{ env.SRCDIR }} + - name: cmake version + run: cmake --version + - name: Restore cache of tarantool ${{ env.T_VERSION }} uses: actions/cache@v4 id: cache From dbff56cb179948aa9f6703379d24fbef6282c89c Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Tue, 16 Sep 2025 14:20:12 +0300 Subject: [PATCH 5/7] new version of cmake --- .github/workflows/testing.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 793798ffe..e326ecc1e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -105,6 +105,14 @@ jobs: - name: cmake version run: cmake --version + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.x' + + - name: cmake version after + run: cmake --version + - name: Restore cache of tarantool ${{ env.T_VERSION }} uses: actions/cache@v4 id: cache From 827a6b1cfb31ac3fa960140fbad32c788acaf595 Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Tue, 16 Sep 2025 14:24:24 +0300 Subject: [PATCH 6/7] different version of cmake --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e326ecc1e..5d78bfb2a 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -108,7 +108,7 @@ jobs: - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '3.x' + cmake-version: '3.29.x' - name: cmake version after run: cmake --version From f41cea6f7b54b3018417d5a77ed17d9a80964679 Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Tue, 16 Sep 2025 14:32:58 +0300 Subject: [PATCH 7/7] remove 1.10 from macos workflow since it wont compile there on new systems --- .github/workflows/testing.yml | 97 ----------------------------------- 1 file changed, 97 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 5d78bfb2a..2fce2f5ec 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -78,12 +78,6 @@ jobs: - macos-14 - macos-15 - macos-26 - tarantool: - - brew - - 1.10.15 - exclude: - - runs-on: macos-14 - tarantool: 1.10.15 env: # Make sense only for non-brew jobs. @@ -102,103 +96,13 @@ jobs: with: path: ${{ env.SRCDIR }} - - name: cmake version - run: cmake --version - - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: cmake-version: '3.29.x' - - name: cmake version after - run: cmake --version - - - name: Restore cache of tarantool ${{ env.T_VERSION }} - uses: actions/cache@v4 - id: cache - with: - path: ${{ env.T_TARDIR }} - key: ${{ matrix.runs-on }}-${{ matrix.tarantool }} - if: matrix.tarantool != 'brew' - - name: Install latest tarantool from brew run: brew install tarantool - if: matrix.tarantool == 'brew' - - - name: Install tarantool build dependencies - run: brew install autoconf automake libtool openssl - if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true' - - - name: Clone tarantool ${{ env.T_VERSION }} - uses: actions/checkout@v5 - with: - repository: tarantool/tarantool - ref: ${{ env.T_VERSION }} - path: ${{ env.T_TARDIR }} - submodules: true - # fetch-depth is 1 by default and it is okay for - # building from a tag. However we have master in - # the version list. - fetch-depth: 0 - if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true' - - - name: Build tarantool ${{ env.T_VERSION }} from sources - run: | - cd "${T_TARDIR}" - # Set RelWithDebInfo just to disable -Werror. - # - # There are tarantool releases on which AppleClang - # complains about the problem that was fixed later in - # https://github.com/tarantool/tarantool/commit/7e8688ff8885cc7813d12225e03694eb8886de29 - # - # Set OpenSSL root directory for linking tarantool with OpenSSL of version 1.1 - # This is related to #49. There are too much deprecations which affect the build and tests. - # Must be revisited after fixing https://github.com/tarantool/tarantool/issues/6477 - 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 - # {{{ Workaround Mac OS build failure (gh-6076) - # - # https://github.com/tarantool/tarantool/issues/6076 - # - # In brief: when "src/lib/small" is in include paths, - # `#include ` from inside Mac OS SDK headers - # attempts to include "src/lib/small/VERSION" as a - # header file that leads to a syntax error. - # - # It was fixed in the following commits: - # - # * 1.10.10-24-g7bce4abd1 - # * 2.7.2-44-gbb1d32903 - # * 2.8.1-56-ga6c29c5af - # * 2.9.0-84-gc5ae543f3 - # - # However applying the workaround for all versions looks - # harmless. - # - # Added -f just in case: I guess we'll drop this useless - # obsoleted VERSION file from the git repository sooner - # or later. - rm -f src/lib/small/VERSION - # The same as above, but for the VERSION file generated - # by tarantool's CMake script. - rm VERSION - # }}} Workaround Mac OS build failure (gh-6076) - # Continue the build. - make -j$(sysctl -n hw.logicalcpu) - make install - if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit != 'true' - - - name: Install tarantool - run: | - cd "${T_TARDIR}" - make install - if: matrix.tarantool != 'brew' && steps.cache.outputs.cache-hit == 'true' - - - name: Verify tarantool version - run: | - # Workaround https://github.com/tarantool/tarantool/issues/4983 - # Workaround https://github.com/tarantool/tarantool/issues/5040 - tarantool -e "require('fiber').sleep(0) assert(_TARANTOOL:startswith('${T_VERSION}'), _TARANTOOL) os.exit()" - if: matrix.tarantool != 'brew' && matrix.tarantool != 'master' - name: Setup golang for the connector and tests uses: actions/setup-go@v5 @@ -207,7 +111,6 @@ jobs: # Workaround issue https://github.com/tarantool/tt/issues/640 - name: Fix tt rocks - if: matrix.tarantool == 'brew' run: | brew ls --verbose tarantool | grep macosx.lua | xargs rm -f