Skip to content

Commit 6ab7ee4

Browse files
committed
fix(ci): Fixed system deps in Linux builds
1 parent 7a68d97 commit 6ab7ee4

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

.github/workflows/presubmit.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
CXX_NAME: clang++
4848
VER: 16
4949
EXCLUSIVE_C_FLAGS: ""
50-
DEPS: [os, vcpkg]
50+
DEPS: [system, vcpkg, fetch]
5151
BIN: [64]
5252
STD:
5353
- C: 11 # Utils C library uses C11 functions (e.g. timespec_get)
@@ -69,7 +69,9 @@ jobs:
6969
C_NAME: gcc
7070
CXX_NAME: g++
7171
VER: 9
72-
EXCLUSIVE_C_FLAGS: ""
72+
# A warning in libstb-dev
73+
EXCLUSIVE_C_FLAGS: "-Wno-type-limits"
74+
EXCLUSIVE_CXX_FLAGS: "-Wno-type-limits"
7375
DEPS: system
7476
BIN: 64
7577
STD:
@@ -84,7 +86,9 @@ jobs:
8486
C_NAME: gcc
8587
CXX_NAME: g++
8688
VER: 9
87-
EXCLUSIVE_C_FLAGS: ""
89+
# A warning in libstb-dev
90+
EXCLUSIVE_C_FLAGS: "-Wno-type-limits"
91+
EXCLUSIVE_CXX_FLAGS: "-Wno-type-limits"
8892
DEPS: system
8993
BIN: 64
9094
STD:
@@ -148,6 +152,10 @@ jobs:
148152
echo "CTEST_EXE=ctest" >> "$GITHUB_ENV" &&
149153
echo "CPACK_EXE=cpack" >> "$GITHUB_ENV"
150154

155+
- name: Install dependencies (system)
156+
if: matrix.DEPS == 'system'
157+
run: apt-get update -qq && apt-get install -y libfreetype-dev libsfml-dev libglm-dev libglew-dev libtclap-dev libstb-dev
158+
151159
- name: Cache dependencies (vcpkg)
152160
if: matrix.DEPS == 'vcpkg'
153161
id: vcpkg-install
@@ -176,7 +184,7 @@ jobs:
176184
# Not using -pedantic: error: ISO C forbids braced-groups within expressions
177185
echo "CFLAGS=-Wall -Wextra -Werror -m${{matrix.BIN}} -Wno-missing-field-initializers ${{ matrix.COMPILER.EXCLUSIVE_C_FLAGS }}" >> $GITHUB_ENV;
178186
# Excluding missing-field-initializers error because it comes from the Std dependency
179-
echo "CXXFLAGS=-Wall -Wextra -pedantic -Werror -m${{matrix.BIN}} -Wno-missing-field-initializers" >> $GITHUB_ENV;
187+
echo "CXXFLAGS=-Wall -Wextra -pedantic -Werror -m${{matrix.BIN}} -Wno-missing-field-initializers ${{ matrix.COMPILER.EXCLUSIVE_CXX_FLAGS }}" >> $GITHUB_ENV;
180188
181189
- name: Checkout OpenCL-SDK
182190
uses: actions/checkout@v4

0 commit comments

Comments
 (0)