From ce1dc29963680c996695913cc4b91ecbe8ff79f4 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 11:36:32 +0300 Subject: [PATCH 1/8] bump CMake version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0794e41..73a7255 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8 FATAL_ERROR) +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(luagraphqlparser C CXX) From 319b86978c6e695984838ec2b1ba335db787c013 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 11:39:14 +0300 Subject: [PATCH 2/8] ci: bump actions versions --- .github/workflows/test_on_push.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index d0b1676..0395eb1 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -11,22 +11,22 @@ jobs: github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login != 'tarantool' strategy: matrix: - tarantool: ["1.10", "2.6", "2.7"] + tarantool: ["2.11"] fail-fast: false runs-on: [ubuntu-latest] steps: - - uses: actions/checkout@v2 - - uses: tarantool/setup-tarantool@v1 + - uses: actions/checkout@v5 + - uses: tarantool/setup-tarantool@v4 with: tarantool-version: ${{ matrix.tarantool }} - 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 +34,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 0.5.2 + tt rocks make --chdir graphql-lua + tt rocks install luatest 0.5.2 .rocks/bin/luatest -v From c5156277bc6088154762a32c921c6f393ba63e55 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 11:44:01 +0300 Subject: [PATCH 3/8] ci: replace tt with tarantoolctl --- .github/workflows/test_on_push.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index 0395eb1..58c00d0 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -22,11 +22,11 @@ jobs: - name: Build module run: | - tt rocks make + tarantoolctl rocks make - name: Run linter run: | - tt rocks install luacheck 0.25.0 + tarantoolctl rocks install luacheck 0.25.0 .rocks/bin/luacheck . - name: Run tests @@ -34,6 +34,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 - tt rocks make --chdir graphql-lua - tt rocks install luatest 0.5.2 + tarantoolctl rocks make --chdir graphql-lua + tarantoolctl rocks install luatest 0.5.2 .rocks/bin/luatest -v From ddc92a230856414d3d1c2bd01114f21511c72180 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:14:05 +0400 Subject: [PATCH 4/8] downgrade tarantool version --- .github/workflows/test_on_push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index 58c00d0..1dcc1ae 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.11"] + tarantool: ["2.10"] fail-fast: false runs-on: [ubuntu-latest] steps: @@ -35,5 +35,5 @@ jobs: 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 0.5.2 + tarantoolctl rocks install luatest 1.2.1 .rocks/bin/luatest -v From 9872fb10dff01c8be324b216a2efafbd9a06520c Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:17:14 +0400 Subject: [PATCH 5/8] ci: downgrade setup-tarantool action --- .github/workflows/test_on_push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index 1dcc1ae..6fca0a3 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -16,7 +16,7 @@ jobs: runs-on: [ubuntu-latest] steps: - uses: actions/checkout@v5 - - uses: tarantool/setup-tarantool@v4 + - uses: tarantool/setup-tarantool@v3 with: tarantool-version: ${{ matrix.tarantool }} From 4bf5cee0fb75ee72592bd2fe05f6af393247a2f8 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:18:34 +0400 Subject: [PATCH 6/8] Update GitHub Actions to use Ubuntu 22.04 --- .github/workflows/test_on_push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml index 6fca0a3..78649fc 100644 --- a/.github/workflows/test_on_push.yaml +++ b/.github/workflows/test_on_push.yaml @@ -13,10 +13,10 @@ jobs: matrix: tarantool: ["2.10"] fail-fast: false - runs-on: [ubuntu-latest] + runs-on: [ubuntu-22.04] steps: - uses: actions/checkout@v5 - - uses: tarantool/setup-tarantool@v3 + - uses: tarantool/setup-tarantool@v4 with: tarantool-version: ${{ matrix.tarantool }} From 2c42ba3d92fa7b7ff6bfc3eeeb7e2c833cb1551a Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:29:19 +0400 Subject: [PATCH 7/8] Fix test for parse function error handling --- test/parse_test.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parse_test.lua b/test/parse_test.lua index 3b9ba1f..7da0950 100644 --- a/test/parse_test.lua +++ b/test/parse_test.lua @@ -11,7 +11,7 @@ local parse = function(str) end function g.test_parse_comments() - t.assert_error(parse('{a(b:"#")}').definitions, {}) + t.assert_error(parse, '{a(b:"#")}') end function g.test_parse_document() From 1736c924e860798ecbdc37c8ce8d03d19692d3e6 Mon Sep 17 00:00:00 2001 From: Oleg Babin <8830475+olegrok@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:36:17 +0400 Subject: [PATCH 8/8] Modify test_parse_comments to check for non-nil definitions Update test to assert that parse does not return nil for comments. --- test/parse_test.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parse_test.lua b/test/parse_test.lua index 7da0950..0b57db1 100644 --- a/test/parse_test.lua +++ b/test/parse_test.lua @@ -11,7 +11,7 @@ local parse = function(str) end function g.test_parse_comments() - t.assert_error(parse, '{a(b:"#")}') + t.assert_not_equals(parse('{a(b:"#")}').definitions, nil) end function g.test_parse_document()