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 51B166ECE3; Fri, 1 Jul 2022 16:12:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 51B166ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1656681129; bh=E/vkrmUGwrOf/lTq8uoSp+iXSzRgDMV3cM059PiiqDU=; 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=NnU6M1y9l47Cw2kIjzfipO2BviayRRYw3b8zQlarYoWvHH/T5U5ngA206ftgmBUXF UfndsIpS6csYgcX5Ot/FLMS79wjVBorQmPD+HoYhwY85wYETWPNrhhfd6QHURnd7J7 T1gM5lLlGU4tnBSXQ1lJZgfRIIYafnZEF3zD4I1g= Received: from smtp55.i.mail.ru (smtp55.i.mail.ru [217.69.128.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C75BF6ECE3 for ; Fri, 1 Jul 2022 16:12:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C75BF6ECE3 Received: by smtp55.i.mail.ru with esmtpa (envelope-from ) id 1o7GRK-0002y5-WF; Fri, 01 Jul 2022 16:12:07 +0300 Message-ID: <5ce7b43b-8624-b2b4-4043-88fd176687b3@tarantool.org> Date: Fri, 1 Jul 2022 16:12:05 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Content-Language: en-US To: Igor Munkin , Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org References: <024281fade12f71b734aece21637ea09c11bc759.1655911291.git.imun@tarantool.org> In-Reply-To: <024281fade12f71b734aece21637ea09c11bc759.1655911291.git.imun@tarantool.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD987C0EE6E7F0A597DB30DCBCA3498717926EAC53CC1594DC3CD62213F67905E7A3862F4DC5AA42B524FE5A7D5AB3CDCF3B9E99AD1D4FE2E87DAEE934B56E2D9F8 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE779AAD18609327F83EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637DD81BB19E5DE3F6B8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D89003235A4E949FF558A69AE899FFB17D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8B8C7ADC89C2F0B2A5A471835C12D1D977C4224003CC836476EB9C4185024447017B076A6E789B0E975F5C1EE8F4F765FC10EF0855632E33EDD81D268191BDAD3DBD4B6F7A4D31EC0BEA7A3FFF5B025636D81D268191BDAD3D78DA827A17800CE7A13D95D359EE1112EC76A7562686271EEC990983EF5C03292E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3BEFA42CFEBB6EED035872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-8FC586DF: 6EFBBC1D9D64D975 X-C1DE0DAB: 9604B64F49C60606AD91A466A1DEF99B296C473AB1E14218C6CDE5D1141D2B1C25F0062DFE287B78335FB3ADFEA3782605F46500FD197483AD91A466A1DEF99B296C473AB1E14218B936CB490224F2464EEA7BD89490CAC0EDDA962BC3F61961 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3455049D7B43D89D64E11A1A0C9C71D0E7D65B096DDF5E7EBBBFEDC0E1684A8C5CE2A0E7EF3E6689E81D7E09C32AA3244C7DC4111F7549E98D73C9D13910D24FCC35DA7DC5AF9B58C0FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojs3a5nOu33tx5bRCMClHn4A== X-Mailru-Sender: 0A26D9779F8DDEAB8BAA69DB2EA45A4D83A27CC391A586C0415A05F0EAB9FAB9A7B5B225E44CC8AB282EC151BADDC1D3523A6D01B4765B2DFB59E2DDD9FE06B14FA522850F29BC30B0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 1/3] ci: fix --parallel argument for MacOS runners 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" LGTM, thanks. On 22.06.2022 18:33, Igor Munkin wrote: > In scope of the commit 4195eb8f7e2abcf75f92eedd2859b7991cc8b363 ("ci: > make GitHub workflows more CMake-ish") --parallel value has been > explicitly set to $(nproc) + 1, since -j default behaviour differs for > Ninja and GnuMake. However, MacOS lacks nproc command, but CI silently > continues to execute pipeline. > > This patch fixed MacOS-specific workflows changing nproc command with > sysctl -n hw.ncpu. > > Signed-off-by: Igor Munkin > --- > .github/workflows/macos-m1.yml | 4 ++-- > .github/workflows/macos-x86_64.yml | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/.github/workflows/macos-m1.yml b/.github/workflows/macos-m1.yml > index 8387bbcf..d1d144f0 100644 > --- a/.github/workflows/macos-m1.yml > +++ b/.github/workflows/macos-m1.yml > @@ -68,6 +68,6 @@ jobs: > - name: configure > run: ${ARCH} cmake . ${{ matrix.CMAKEFLAGS }} -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }} > - name: build > - run: ${ARCH} cmake --build . --parallel $(($(nproc) + 1)) > + run: ${ARCH} cmake --build . --parallel $(($(sysctl -n hw.ncpu) + 1)) > - name: test > - run: ${ARCH} cmake --build . --parallel $(($(nproc) + 1)) --target test > + run: ${ARCH} cmake --build . --parallel $(($(sysctl -n hw.ncpu) + 1)) --target test > diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml > index 2ab2c8d0..a7c2f4e3 100644 > --- a/.github/workflows/macos-x86_64.yml > +++ b/.github/workflows/macos-x86_64.yml > @@ -63,6 +63,6 @@ jobs: > - name: configure > run: cmake . ${{ matrix.CMAKEFLAGS }} -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }} > - name: build > - run: cmake --build . --parallel $(($(nproc) + 1)) > + run: cmake --build . --parallel $(($(sysctl -n hw.ncpu) + 1)) > - name: test > - run: cmake --build . --parallel $(($(nproc) + 1)) --target test > + run: cmake --build . --parallel $(($(sysctl -n hw.ncpu) + 1)) --target test