Skip to content

Commit 8826142

Browse files
committed
ci: make GitHub workflows more CMake-ish
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).
1 parent 951733d commit 8826142

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ jobs:
4545
- name: configure
4646
run: cmake .
4747
- name: test
48-
run: make -j LuaJIT-luacheck
48+
run: cmake --build . -j -t LuaJIT-luacheck

.github/workflows/linux-aarch64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ jobs:
5454
- name: configure
5555
run: cmake . ${{ matrix.CMAKEFLAGS }} -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }}
5656
- name: build
57-
run: make -j
57+
run: cmake --build . -j
5858
- name: test
59-
run: make -j test
59+
run: cmake --build . -j -t test

.github/workflows/linux-x86_64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ jobs:
5454
- name: configure
5555
run: cmake . ${{ matrix.CMAKEFLAGS }} -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }}
5656
- name: build
57-
run: make -j
57+
run: cmake --build . -j
5858
- name: test
59-
run: make -j test
59+
run: cmake --build . -j -t test

.github/workflows/macos-m1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ jobs:
6868
- name: configure
6969
run: ${ARCH} cmake . ${{ matrix.CMAKEFLAGS }} -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }}
7070
- name: build
71-
run: ${ARCH} make -j
71+
run: ${ARCH} cmake --build . -j
7272
- name: test
73-
run: ${ARCH} make -j test
73+
run: ${ARCH} cmake --build . -j -t test

.github/workflows/macos-x86_64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ jobs:
6363
- name: configure
6464
run: cmake . ${{ matrix.CMAKEFLAGS }} -DLUAJIT_ENABLE_GC64=${{ matrix.GC64 }}
6565
- name: build
66-
run: make -j
66+
run: cmake --build . -j
6767
- name: test
68-
run: make -j test
68+
run: cmake --build . -j -t test

0 commit comments

Comments
 (0)