Skip to content

Commit fbd56cd

Browse files
Fix CQ failures.
1 parent 66d1c1f commit fbd56cd

3 files changed

Lines changed: 17 additions & 12 deletions

File tree

.github/workflows/build.yaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Build
22

33
on:
44
create:
5-
tags:
6-
-v*
75
push:
86
branches:
97
- main
@@ -28,10 +26,11 @@ jobs:
2826
compiler: llvm
2927
gcov_executable: "llvm-cov gcov"
3028

31-
- name: MacOS clang
32-
os: macos-latest
33-
compiler: llvm
34-
gcov_executable: "llvm-cov gcov"
29+
# https://github.com/aminya/setup-cpp/issues/246
30+
#- name: MacOS clang
31+
#os: macos-latest
32+
#compiler: llvm
33+
#gcov_executable: "llvm-cov gcov"
3534

3635
- name: Windows MSVC
3736
os: windows-latest
@@ -44,7 +43,7 @@ jobs:
4443
id: cpu-cores
4544

4645
- name: "Checkout repository"
47-
uses: actions/checkout@v2
46+
uses: actions/checkout@v3
4847

4948
- name: "Setup Cpp"
5049
uses: aminya/setup-cpp@v1
@@ -79,11 +78,16 @@ jobs:
7978
cmake
8079
--build ./build
8180
82-
- name: Unix - Test and coverage
81+
- name: Unix - Test
8382
if: runner.os != 'Windows'
8483
working-directory: ./build
8584
run: >
8685
ctest -C Debug --rerun-failed --output-on-failure;
86+
87+
- name: Unix - coverage
88+
if: runner.os != 'Windows'
89+
working-directory: ./build
90+
run: >
8791
gcovr
8892
-j ${{env.nproc}}
8993
--delete
@@ -155,7 +159,7 @@ jobs:
155159
id: cpu-cores
156160

157161
- name: "Checkout repository"
158-
uses: actions/checkout@v2
162+
uses: actions/checkout@v3
159163

160164
- name: "Install cmake"
161165
uses: lukka/get-cmake@latest
@@ -186,7 +190,7 @@ jobs:
186190
runs-on: ubuntu-latest
187191
steps:
188192
- name: "Checkout repository"
189-
uses: actions/checkout@v2
193+
uses: actions/checkout@v3
190194

191195
- name: "Install cmake"
192196
uses: lukka/get-cmake@latest

src/ftxui/component/screen_interactive.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
#error Must be compiled in UNICODE mode
4747
#endif
4848
#else
49-
#include <bits/types/struct_timeval.h>
5049
#include <sys/select.h> // for select, FD_ISSET, FD_SET, FD_ZERO, fd_set, timeval
5150
#include <termios.h> // for tcsetattr, termios, tcgetattr, TCSANOW, cc_t, ECHO, ICANON, VMIN, VTIME
5251
#include <unistd.h> // for STDIN_FILENO, read
@@ -163,7 +162,7 @@ void ftxui_on_resize(int columns, int rows) {
163162
#else // POSIX (Linux & Mac)
164163

165164
int CheckStdinReady(int usec_timeout) {
166-
timeval tv = {0, usec_timeout};
165+
timeval tv = {0, usec_timeout}; // NOLINT
167166
fd_set fds;
168167
FD_ZERO(&fds); // NOLINT
169168
FD_SET(STDIN_FILENO, &fds); // NOLINT

src/ftxui/screen/color.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ std::string Color::Print(bool is_background_color) const {
6969
";" + std::to_string(blue_);
7070
}
7171
}
72+
// NOTREACHED();
73+
return "";
7274
}
7375

7476
/// @brief Build a transparent color.

0 commit comments

Comments
 (0)