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 277366EFDA; Wed, 1 Jun 2022 19:01:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 277366EFDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1654099294; bh=4vD4kEmioXtkAsrk9YQSN+emG2GAk42OECpaTIHAWnY=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=AD/HqfAVvIpYU5is/KrXuflvFuMkPd1Baa1YibZTJiwt0FS7ePxf3zLqN0eEkN1cQ ky8jf3gewGxcKak3Gr64joqozLTl3AogJs7+vJxZoBry7+PIiiwYH4fZ1a8LolI52J XJwgCw8haq3su2wu9HCx3A8vZXscrLF+6zDvxU5w= Received: from smtpng2.i.mail.ru (smtpng2.i.mail.ru [94.100.179.3]) (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 DAA846EFDA for ; Wed, 1 Jun 2022 19:01:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DAA846EFDA Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1nwQmp-0006Qe-Q8; Wed, 01 Jun 2022 19:01:32 +0300 To: Sergey Kaplun , Sergey Bronnikov Date: Wed, 1 Jun 2022 18:54:29 +0300 Message-Id: <8826142ef8ae2e352728e3b4fdf5390851fe2e25.1654098694.git.imun@tarantool.org> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD93C5C90AC751DDC8C9A8909CE9D77FD1A819BC97AD7C120D91313CFAB8367EF908E2BE116634AD74DF85292FFD60A4966F0B8B6F6CBFB5B17FD71FBAB677426DF6837A08AC964547F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7EED5D2FAB4CEB1EDEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AE01C1A20EF0A1348638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8AEF5FE8B2A992DA707A7237CFA7A8684117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6BF3059D42242344A089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-8FC586DF: 6EFBBC1D9D64D975 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C12E16A1CA7CEB7BD587201A7485AF892B5547CC15A8F36479C2B6934AE262D3EE7EAB7254005DCEDAFF06DBD94749F9BF36E2E0160E5C55395B8A2A0B6518DF68C46860778A80D548DA55E71E02F9FC08E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C974B02B4EA30DFBDC1AC46FD21C3EE76F9B10BAD89C533FD73314FF493CB807F2B0DF7CBF9DDF781D7E09C32AA3244C3B9A258BF5F1203FC9089FE240E3FCB03C6EB905E3A8056B927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXiadUSpHqjuoqXYkWlIahaP X-Mailru-Sender: 689FA8AB762F739339CABD9B3CA9A7D690D6B7042922F8D85B236D64358F1183A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E3365FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit] ci: make GitHub workflows more CMake-ish 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" Using explicit commands makes changing the build system generator to another one (e.g. Ninja) too verbose. Fortunately, we can use generator-agnostic command provided by CMake, so the only spot where generator name occurs is the configuration step of GitHub workflow (UNIX Makefiles are generated for UNIX-like platforms by default). Signed-off-by: Igor Munkin --- Branch: https://github.com/tarantool/luajit/tree/imun/cmake-ish-workflow CI: https://github.com/tarantool/luajit/commit/8826142 Tarantool CI results ares excess, since the changeset relates only to tarantool/luajit GitHub Actions. .github/workflows/lint.yml | 2 +- .github/workflows/linux-aarch64.yml | 4 ++-- .github/workflows/linux-x86_64.yml | 4 ++-- .github/workflows/macos-m1.yml | 4 ++-- .github/workflows/macos-x86_64.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9e7cc1f1..ff4b0ac2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -45,4 +45,4 @@ jobs: - name: configure run: cmake . - name: test - run: make -j LuaJIT-luacheck + run: cmake --build . -j -t LuaJIT-luacheck diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml index 09b85b56..2f62394f 100644 --- a/.github/workflows/linux-aarch64.yml +++ b/.github/workflows/linux-aarch64.yml @@ -54,6 +54,6 @@ jobs: - name: configure run: cmake . ${{ matrix.CMAKEFLAGS }} -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }} - name: build - run: make -j + run: cmake --build . -j - name: test - run: make -j test + run: cmake --build . -j -t test diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml index a1e3a618..4e6e3d9b 100644 --- a/.github/workflows/linux-x86_64.yml +++ b/.github/workflows/linux-x86_64.yml @@ -54,6 +54,6 @@ jobs: - name: configure run: cmake . ${{ matrix.CMAKEFLAGS }} -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }} - name: build - run: make -j + run: cmake --build . -j - name: test - run: make -j test + run: cmake --build . -j -t test diff --git a/.github/workflows/macos-m1.yml b/.github/workflows/macos-m1.yml index eb822142..a272e39b 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} make -j + run: ${ARCH} cmake --build . -j - name: test - run: ${ARCH} make -j test + run: ${ARCH} cmake --build . -j -t test diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml index 09f391db..d639e872 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: make -j + run: cmake --build . -j - name: test - run: make -j test + run: cmake --build . -j -t test -- 2.34.0