From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 42B1413D1015; Mon, 2 Jun 2025 14:02:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 42B1413D1015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1748862158; bh=mds5ZZIjvCJ9rUJZAugyushZDLrYRjvc8CXNh4lEsXo=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=i/8vQVcNmwfX2pkck+AuiWaQLM+eBAyFwgdaftxeCiWjU4oagJtA4cbAYDTFMCD4N ynpBnZwkJtDQ/kR1Akt4ORr9eolF/fi2tqCBQjCd/VVw2ukG7Pez52txzQON8hcytL g3pCENnBLJDMmOC2mWrJqTIkk85UbzDGXO+hVQB0= Received: from send194.i.mail.ru (send194.i.mail.ru [95.163.59.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D0638461E01 for ; Mon, 2 Jun 2025 14:02:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D0638461E01 Received: by exim-smtp-985c69c7d-p57sk with esmtpa (envelope-from ) id 1uM2w7-00000000J3K-33md; Mon, 02 Jun 2025 14:02:36 +0300 Content-Type: multipart/alternative; boundary="------------0qTqK5uRqRh4gsC0vvTHOwLM" Message-ID: <69cc8ae2-648c-41e0-b4e2-c38256cda8b7@tarantool.org> Date: Mon, 2 Jun 2025 14:02:35 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org References: <20250530121233.13591-1-skaplun@tarantool.org> Content-Language: en-US In-Reply-To: <20250530121233.13591-1-skaplun@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9851146C857904EAB790E43E057E9FB7074225A96CFDC5B55182A05F5380850402D710421A9026EC53DE06ABAFEAF6705AE32917C208999CC66753032589A46D5EED4BE88F6E8E844 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7FCFCB92DA8654BB0EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379BF04B24BEB7B2D58638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2C68C3D5F0544E2AE2E070BE324C7D3C4CB70AF97B5A37F26F6B57BC7E64490618DEB871D839B73339E8FC8737B5C2249D52CD31C43BF465FCC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C078FCF50C7EAF9C588941B15DA834481F9449624AB7ADAF37BA3038C0950A5D3613377AFFFEAFD269176DF2183F8FC7C0FD819E82F1CB48997B076A6E789B0E97A8DF7F3B2552694AD5FFEEA1DED7F25D49FD398EE364050F9647ADFADE5905B1CE99E4F20BAF2718B3661434B16C20ACC84D3B47A649675FE827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B0E0583254ED37F2E75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A56F92EF050AC9FDBF5002B1117B3ED696E0C8A47D863178E70E58516B1639A14B823CB91A9FED034534781492E4B8EEAD21D4E6D365FE45D1BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFA1048687082DB104955121ADCAFF47AC505DA4DEDC2D0E407120BE9792696DFD16D5D591715857EC3968DBE8110FF34ED43AE2137F8DD54DEA56412B0DD867BD26F6FA7E86FB2C7B111DC66A97D0BFE2913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVVyIuFBRopBh/3i3LXQgVVU= X-Mailru-Sender: 520A125C2F17F0B1E52FEF5D219D61405C17A8F7D7B8309D8E7FD94675F335657698BD2112FDE1B90152A3D17938EB451EB5A0BCEC6A560B3DDE9B364B0DF289BE2DA36745F2EEB5CEBA01FB949A1F1EEAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] ci: use Tarantool revision in integration workflow X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This is a multi-part message in MIME format. --------------0qTqK5uRqRh4gsC0vvTHOwLM Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Sergey, thanks for the patch! LGTM and in a private conversation we decided to document all steps required for managing branches in repository somewhere. I believe it will help us to reduce a probability of mistakes like wrong `tarantool_revision` in release branch. Sergey On 5/30/25 15:12, Sergey Kaplun wrote: > This patch adds the specific Tarantool revision to be checked out in > callee workflows to avoid the inconsistency between the used workflow > and the version of Tarantool that ref we are using. This revision should > be updated during the bump of the workflow to the corresponding > long-term branch. > > The patch left the workflow intact since it uses a > different approach. > --- > > Branch:https://github.com/tarantool/luajit/tree/skaplun/tarantool-integration-branch-revision > > .github/workflows/integration-tarantool-ecosystem.yml | 1 + > .github/workflows/integration-tarantool.yml | 11 +++++++++++ > 2 files changed, 12 insertions(+) > > diff --git a/.github/workflows/integration-tarantool-ecosystem.yml b/.github/workflows/integration-tarantool-ecosystem.yml > index e303ae32..7b37bf86 100644 > --- a/.github/workflows/integration-tarantool-ecosystem.yml > +++ b/.github/workflows/integration-tarantool-ecosystem.yml > @@ -43,3 +43,4 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > diff --git a/.github/workflows/integration-tarantool.yml b/.github/workflows/integration-tarantool.yml > index 86182dd3..3d6deb6e 100644 > --- a/.github/workflows/integration-tarantool.yml > +++ b/.github/workflows/integration-tarantool.yml > @@ -39,6 +39,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-debug: > name: debug > @@ -46,6 +47,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-debug_aarch64: > name: debug aarch64 > @@ -53,6 +55,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-debug_asan_clang: > name: debug ASAN clang > @@ -60,6 +63,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-out_of_source: > name: out of source > @@ -67,6 +71,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-release: > name: release > @@ -74,6 +79,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-release_asan_clang: > name: release ASAN clang > @@ -81,6 +87,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-release_clang: > name: release clang > @@ -88,6 +95,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-release_lto: > name: release lto > @@ -95,6 +103,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-release_lto_clang: > name: release lto clang > @@ -102,6 +111,7 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master > > test-tarantool-static_build: > name: static build > @@ -109,3 +119,4 @@ jobs: > with: > submodule: luajit > revision: ${{ github.sha }} > + tarantool_revision: master --------------0qTqK5uRqRh4gsC0vvTHOwLM Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Hi, Sergey,

thanks for the patch!

LGTM and in a private conversation we decided to document

all steps required for managing branches in repository somewhere. I believe

it will help us to reduce a probability of mistakes like wrong `tarantool_revision`

in release branch.

Sergey

On 5/30/25 15:12, Sergey Kaplun wrote:
This patch adds the specific Tarantool revision to be checked out in
callee workflows to avoid the inconsistency between the used workflow
and the version of Tarantool that ref we are using. This revision should
be updated during the bump of the workflow to the corresponding
long-term branch.

The patch left the <testing.yml> workflow intact since it uses a
different approach.
---

Branch: https://github.com/tarantool/luajit/tree/skaplun/tarantool-integration-branch-revision

 .github/workflows/integration-tarantool-ecosystem.yml |  1 +
 .github/workflows/integration-tarantool.yml           | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/integration-tarantool-ecosystem.yml b/.github/workflows/integration-tarantool-ecosystem.yml
index e303ae32..7b37bf86 100644
--- a/.github/workflows/integration-tarantool-ecosystem.yml
+++ b/.github/workflows/integration-tarantool-ecosystem.yml
@@ -43,3 +43,4 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
diff --git a/.github/workflows/integration-tarantool.yml b/.github/workflows/integration-tarantool.yml
index 86182dd3..3d6deb6e 100644
--- a/.github/workflows/integration-tarantool.yml
+++ b/.github/workflows/integration-tarantool.yml
@@ -39,6 +39,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-debug:
     name: debug
@@ -46,6 +47,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-debug_aarch64:
     name: debug aarch64
@@ -53,6 +55,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-debug_asan_clang:
     name: debug ASAN clang
@@ -60,6 +63,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-out_of_source:
     name: out of source
@@ -67,6 +71,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-release:
     name: release
@@ -74,6 +79,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-release_asan_clang:
     name: release ASAN clang
@@ -81,6 +87,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-release_clang:
     name: release clang
@@ -88,6 +95,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-release_lto:
     name: release lto
@@ -95,6 +103,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-release_lto_clang:
     name: release lto clang
@@ -102,6 +111,7 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
 
   test-tarantool-static_build:
     name: static build
@@ -109,3 +119,4 @@ jobs:
     with:
       submodule: luajit
       revision: ${{ github.sha }}
+      tarantool_revision: master
--------------0qTqK5uRqRh4gsC0vvTHOwLM--