From e307c64015254cf99272962103a3381feaed1833 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 17:28:53 +0300 Subject: [PATCH 1/4] ci: bump tarantool to 2.11 --- .github/workflows/test_on_push.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index 78649fc..fc67b7c 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -11,7 +11,7 @@ jobs: github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login != 'tarantool' strategy: matrix: - tarantool: ["2.10"] + tarantool: ["2.11"] fail-fast: false runs-on: [ubuntu-22.04] steps: @@ -19,14 +19,15 @@ jobs: - uses: tarantool/setup-tarantool@v4 with: tarantool-version: ${{ matrix.tarantool }} + - run: sudo apt install https://github.com/tarantool/tt/releases/download/v2.11.0/tt_2.11.0_amd64.deb - name: Build module run: | - tarantoolctl rocks make + tt rocks make - name: Run linter run: | - tarantoolctl rocks install luacheck 0.25.0 + tt rocks install luacheck 0.25.0 .rocks/bin/luacheck . - name: Run tests @@ -34,6 +35,6 @@ jobs: git clone https://github.com/bjornbytes/graphql-lua sed -i 's/lpeg/lulpeg/g' graphql-lua/graphql-0.0.2-1.rockspec sed -i "s/local lpeg = require 'lpeg'/local lpeg = require 'lulpeg'/g" graphql-lua/graphql/parse.lua - tarantoolctl rocks make --chdir graphql-lua - tarantoolctl rocks install luatest 1.2.1 + tt rocks make --chdir graphql-lua + tt rocks install luatest 1.2.1 .rocks/bin/luatest -v From 5a428eee86babc8b028b019664220e1f1e8b09ff Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 17:33:41 +0300 Subject: [PATCH 2/4] Update tt installation method in workflow Replaced direct installation of tt with wget to download the package first. --- .github/workflows/test_on_push.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index fc67b7c..c45caf5 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -19,7 +19,9 @@ jobs: - uses: tarantool/setup-tarantool@v4 with: tarantool-version: ${{ matrix.tarantool }} - - run: sudo apt install https://github.com/tarantool/tt/releases/download/v2.11.0/tt_2.11.0_amd64.deb + - run: | + wget -O /tmp/tt.deb https://github.com/tarantool/tt/releases/download/v2.11.0/tt_2.11.0_amd64.deb + sudo apt install /tmp/tt.deb - name: Build module run: | From 3eeb7a99ed71ce3810d5fa82eae97008ab7d25b5 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 17:40:21 +0300 Subject: [PATCH 3/4] Simplify test workflow by removing lpeg modifications Removed sed commands for lpeg replacement in tests. --- .github/workflows/test_on_push.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index c45caf5..fc54809 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -35,8 +35,6 @@ jobs: - name: Run tests run: | git clone https://github.com/bjornbytes/graphql-lua - sed -i 's/lpeg/lulpeg/g' graphql-lua/graphql-0.0.2-1.rockspec - sed -i "s/local lpeg = require 'lpeg'/local lpeg = require 'lulpeg'/g" graphql-lua/graphql/parse.lua tt rocks make --chdir graphql-lua tt rocks install luatest 1.2.1 .rocks/bin/luatest -v From 0ad6e1eee8ee741f61ae10c1ced8e0a735538a07 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 17:54:37 +0300 Subject: [PATCH 4/4] Add installation of lpeg rock in CI workflow --- .github/workflows/test_on_push.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index fc54809..5521bba 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -35,6 +35,7 @@ jobs: - name: Run tests run: | git clone https://github.com/bjornbytes/graphql-lua + tt rocks install https://luarocks.org/manifests/gvvaughan/lpeg-1.1.0-2.rockspec tt rocks make --chdir graphql-lua tt rocks install luatest 1.2.1 .rocks/bin/luatest -v