Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility fixes needed for tarantool/tarantool#8147 #440

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions .github/workflows/fast_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ jobs:
- '2.8'
- '2.10'
- 'release-master'
- 'pr/8630'

env:
TNT_RELEASE_PATH: /home/runner/tnt-release

runs-on: ubuntu-20.04
steps:
- name: Install tarantool ${{ matrix.tarantool }}
if: startsWith(matrix.tarantool, 'release') != true
if: matrix.tarantool != 'release-master' && matrix.tarantool != 'pr/8630'
uses: tarantool/setup-tarantool@v2
with:
tarantool-version: ${{ matrix.tarantool }}
Expand Down Expand Up @@ -72,8 +73,18 @@ jobs:
fetch-depth: 0
submodules: true

- name: Clone tarantool fork with ${{ matrix.tarantool }}
if: matrix.tarantool == 'pr/8630'
uses: actions/checkout@v3
with:
repository: curiousgeorgiy/tarantool
ref: gh-8147-tuple-formats-in-iproto-responses
path: tarantool
fetch-depth: 0
submodules: true

- name: Build tarantool ${{ matrix.tarantool }}
if: startsWith(matrix.tarantool, 'release') && steps.cache-tnt-release.outputs.cache-hit != 'true'
if: (startsWith(matrix.tarantool, 'release') && steps.cache-tnt-release.outputs.cache-hit != 'true') || matrix.tarantool == 'pr/8630'
run: |
sudo apt-get -y install build-essential cmake make zlib1g-dev libreadline-dev libncurses5-dev \
libssl-dev libunwind-dev libicu-dev python3 python3-yaml python3-six python3-gevent
Expand All @@ -83,7 +94,7 @@ jobs:
make && make DESTDIR=${TNT_RELEASE_PATH} install

- name: Install tarantool ${{ matrix.tarantool }}
if: startsWith(matrix.tarantool, 'release')
if: startsWith(matrix.tarantool, 'release') || matrix.tarantool == 'pr/8630'
# Workaround as actions/cache cannot restore data to /usr/local
run: sudo cp -rvP ${TNT_RELEASE_PATH}/usr/local/* /usr/local/

Expand Down
2 changes: 1 addition & 1 deletion vshard/hash.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ end
-- double.
--
local function mpcrc32(shard_key)
if type(shard_key) ~= 'table' then
if type(shard_key) ~= 'table' and not box.tuple.is(shard_key) then
return ldigest.crc32(mpcrc32_one(shard_key))
else
local crc32 = ldigest.crc32.new()
Expand Down
Loading