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 1AEC46ECE3; Wed, 22 Jun 2022 18:40:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1AEC46ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1655912454; bh=lIKRDjUTUSMSYiZ10qYy8gwoQqAstKCqYVRN6WsQU/0=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=UowaPD6ZoZXtze/5oT4McZLI8IOrcbkUHMqljsbKJtcJURXi4PVAeCaovkYyDSJwZ YYthpxcf/1PHoSNYhMi8mT4GPkRzvI5nap1NTM68/to6SrZisuFycaz6LgN/ta6Bsd DTNgGEuKXIpbar4KZlkFNuqmmrsIdUoDoXHKJp7I= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [94.100.177.149]) (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 EEF626ECE3 for ; Wed, 22 Jun 2022 18:40:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EEF626ECE3 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1o42St-0000ud-2B; Wed, 22 Jun 2022 18:40:23 +0300 To: Sergey Kaplun , Sergey Bronnikov Date: Wed, 22 Jun 2022 18:33:12 +0300 Message-Id: <024281fade12f71b734aece21637ea09c11bc759.1655911291.git.imun@tarantool.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9344F665CF1C84C29AA5A36C38CB512672103A23D92B3673F182A05F5380850401CF8EFEE7266C0C10BD47173664CD37A0B0869B95F001D6372A86ACCB96BEF9F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A4C4638C9DDF45FCEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637BB46061768088B55EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38B8859CA687ABA27BA03BB18CB1CB1A6C01CBB37077CAD6B16CC7F00164DA146DA9985D098DBDEAEC8ED96AA85C75E140D117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F790063788B3B24285A3CD0EEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-8FC586DF: 6EFBBC1D9D64D975 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C41E93BD56E7067354307CAA32FF218580205367B2BCC23E5B59A15564E9B35C0FA9D420A4CFB5DD3ED3A00CBBD1411013E14DC8D5F3AF43E291630949A7C77CC6D59269BC5F550898D99A6476B3ADF6B4C79554A2A72441328621D336A7BC284946AD531847A6065A6EEA0E1E362FEDAA410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A783A638E01A3CDE8185C3DE101E2B530F0DC24D98FEF2E752AB67E39DEFBCE608D60F4C5FA5930C1D7E09C32AA3244CCC3AA04446CDF73448DD851326FFA991795D98D676DD64D0927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj9/HGj9wIviMSq8ORwSVzVw== X-Mailru-Sender: 689FA8AB762F7393CC2E0F076E87284E6285DB09C35EB17BD98603B056B1971DA7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E3365FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 -- 2.34.0