From 37d9932083bbe45b84c66802f8cd1166d0bd9df4 Mon Sep 17 00:00:00 2001 From: rainingmaster <312841925@qq.com> Date: Tue, 9 Jun 2020 10:42:05 +0800 Subject: [PATCH 1/3] chore: update mergify for test --- .mergify.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..c1f52ac --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,23 @@ +pull_request_rules: + - name: tag no test cases update when update source code + conditions: + - files~=^lib/ + - -files~=^t/ + actions: + label: + add: + - no-test-cases + - name: tag test cases update when update source code + conditions: + - files~=^lib/ + - files~=^t/ + actions: + label: + remove: + - no-test-cases + - name: ask to resolve conflict + conditions: + - conflict + actions: + comment: + message: This pull request is now in conflicts. From 4581ecd48046766ed1ce8a82fa4e31d387838ca2 Mon Sep 17 00:00:00 2001 From: rainingmaster <312841925@qq.com> Date: Tue, 9 Jun 2020 11:53:50 +0800 Subject: [PATCH 2/3] test for mergify --- lib/resty/nsq/queue.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/resty/nsq/queue.lua b/lib/resty/nsq/queue.lua index 4d5f71e..7970741 100755 --- a/lib/resty/nsq/queue.lua +++ b/lib/resty/nsq/queue.lua @@ -20,6 +20,7 @@ _M._VERSION = '0.01' _M.new_tab = new_tab +-- we test here local MAX_SIZE = 5000 local mt = { __index = _M } From 666c8f761ed16d735ce3cead02a8a4d486733414 Mon Sep 17 00:00:00 2001 From: rainingmaster <312841925@qq.com> Date: Tue, 9 Jun 2020 11:55:15 +0800 Subject: [PATCH 3/3] chore: update test cases --- t/queue.t | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/queue.t b/t/queue.t index c95620f..3d6f14a 100644 --- a/t/queue.t +++ b/t/queue.t @@ -128,6 +128,9 @@ nil:fulled, in 11 if not ret then ngx.say(ret, ":", err, ", in ", i) -- ngx.log(ngx.ERR, ret, ":", err, ", in ", i) + -- ngx.log(ngx.ERR, ret, ":", err, ", in ", i) + -- ngx.log(ngx.ERR, ret, ":", err, ", in ", i) + -- ngx.log(ngx.ERR, ret, ":", err, ", in ", i) end if i == 5 then