Tarantool development patches archive
 help / color / mirror / Atom feed
From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Kaplun <skaplun@tarantool.org>,
	Sergey Bronnikov <sergeyb@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH luajit] ci: make GitHub workflows more CMake-ish
Date: Wed,  1 Jun 2022 18:54:29 +0300	[thread overview]
Message-ID: <8826142ef8ae2e352728e3b4fdf5390851fe2e25.1654098694.git.imun@tarantool.org> (raw)

Using explicit <make> 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 <imun@tarantool.org>
---

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


             reply	other threads:[~2022-06-01 16:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-01 15:54 Igor Munkin via Tarantool-patches [this message]
2022-06-02  7:45 ` Sergey Kaplun via Tarantool-patches
2022-06-06 10:19   ` Igor Munkin via Tarantool-patches
2022-06-02 12:25 ` Sergey Bronnikov via Tarantool-patches
2022-06-02 16:00   ` Igor Munkin via Tarantool-patches
2022-06-03 10:15     ` Sergey Bronnikov via Tarantool-patches
2022-06-06 10:18       ` Igor Munkin via Tarantool-patches
2022-06-20 12:47 ` Igor Munkin via Tarantool-patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8826142ef8ae2e352728e3b4fdf5390851fe2e25.1654098694.git.imun@tarantool.org \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=imun@tarantool.org \
    --cc=sergeyb@tarantool.org \
    --cc=skaplun@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH luajit] ci: make GitHub workflows more CMake-ish' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox