Skip to content

Commit 56c5aae

Browse files
committed
rework c-cpp-build workflow to use the compiler name
1 parent 1e5b6c6 commit 56c5aae

1 file changed

Lines changed: 9 additions & 41 deletions

File tree

.github/workflows/c-cpp-build.yml

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,10 @@ jobs:
4242
- 5.3
4343
- 5.4
4444

45-
use-clang:
46-
- true
47-
- false
48-
49-
use-cpp:
50-
- true
51-
- false
45+
cc:
46+
- g++
47+
- clang
48+
- clang++
5249

5350
steps:
5451

@@ -72,43 +69,14 @@ jobs:
7269
run: sudo apt install -y liblzma-dev
7370

7471
- name: Install clang
75-
if: ${{ matrix.use-clang }}
72+
if: ${{ startsWith(matrix.cc, 'clang') }}
7673
run: sudo apt install -y clang
7774

78-
- name: Setup Lua (clang++)
79-
if: ${{ matrix.use-clang && matrix.use-cpp }}
80-
uses: luau-project/setup-lua@4598c69e67a91a1621b5ab4aed54fd9ab82c3508 # v1.0.3
81-
with:
82-
cc: clang++
83-
ld: clang++
84-
ar: llvm-ar
85-
ranlib: llvm-ranlib
86-
lua-version: ${{ matrix.lua-version }}
87-
88-
- name: Setup Lua (clang)
89-
if: ${{ matrix.use-clang && !matrix.use-cpp }}
90-
uses: luau-project/setup-lua@4598c69e67a91a1621b5ab4aed54fd9ab82c3508 # v1.0.3
91-
with:
92-
cc: clang
93-
ld: clang
94-
ar: llvm-ar
95-
ranlib: llvm-ranlib
96-
lua-version: ${{ matrix.lua-version }}
97-
98-
- name: Setup Lua (g++)
99-
if: ${{ !matrix.use-clang && matrix.use-cpp }}
100-
uses: luau-project/setup-lua@4598c69e67a91a1621b5ab4aed54fd9ab82c3508 # v1.0.3
101-
with:
102-
cc: g++
103-
ld: g++
104-
lua-version: ${{ matrix.lua-version }}
105-
106-
- name: Setup Lua (gcc)
107-
if: ${{ !matrix.use-clang && !matrix.use-cpp }}
108-
uses: luau-project/setup-lua@4598c69e67a91a1621b5ab4aed54fd9ab82c3508 # v1.0.3
75+
- name: Setup Lua (matrix.cc)
76+
uses: luau-project/[email protected]
10977
with:
110-
cc: gcc
111-
ld: gcc
78+
cc: ${{ matrix.cc }}
79+
ld: ${{ matrix.cc }}
11280
lua-version: ${{ matrix.lua-version }}
11381

11482
- name: Lint rockspecs

0 commit comments

Comments
 (0)