Skip to content

Commit

Permalink
Fix CQ failures.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurSonzogni committed Aug 17, 2024
1 parent 66d1c1f commit 8fbe852
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 13 deletions.
26 changes: 15 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Build

on:
create:
tags:
-v*
push:
branches:
- main
Expand All @@ -28,10 +26,11 @@ jobs:
compiler: llvm
gcov_executable: "llvm-cov gcov"

- name: MacOS clang
os: macos-latest
compiler: llvm
gcov_executable: "llvm-cov gcov"
# https://github.com/aminya/setup-cpp/issues/246
#- name: MacOS clang
#os: macos-latest
#compiler: llvm
#gcov_executable: "llvm-cov gcov"

- name: Windows MSVC
os: windows-latest
Expand All @@ -44,7 +43,7 @@ jobs:
id: cpu-cores

- name: "Checkout repository"
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: "Setup Cpp"
uses: aminya/setup-cpp@v1
Expand All @@ -55,7 +54,7 @@ jobs:
ninja: true
clangtidy: false
cppcheck: false
gcovr: "5.0"
gcovr: true
opencppcoverage: true

# make sure coverage is only enabled for Debug builds, since it sets -O0
Expand All @@ -79,11 +78,16 @@ jobs:
cmake
--build ./build
- name: Unix - Test and coverage
- name: Unix - Test
if: runner.os != 'Windows'
working-directory: ./build
run: >
ctest -C Debug --rerun-failed --output-on-failure;
- name: Unix - coverage
if: runner.os != 'Windows'
working-directory: ./build
run: >
gcovr
-j ${{env.nproc}}
--delete
Expand Down Expand Up @@ -155,7 +159,7 @@ jobs:
id: cpu-cores

- name: "Checkout repository"
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: "Install cmake"
uses: lukka/get-cmake@latest
Expand Down Expand Up @@ -186,7 +190,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout repository"
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: "Install cmake"
uses: lukka/get-cmake@latest
Expand Down
3 changes: 1 addition & 2 deletions src/ftxui/component/screen_interactive.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#error Must be compiled in UNICODE mode
#endif
#else
#include <bits/types/struct_timeval.h>
#include <sys/select.h> // for select, FD_ISSET, FD_SET, FD_ZERO, fd_set, timeval
#include <termios.h> // for tcsetattr, termios, tcgetattr, TCSANOW, cc_t, ECHO, ICANON, VMIN, VTIME
#include <unistd.h> // for STDIN_FILENO, read
Expand Down Expand Up @@ -163,7 +162,7 @@ void ftxui_on_resize(int columns, int rows) {
#else // POSIX (Linux & Mac)

int CheckStdinReady(int usec_timeout) {
timeval tv = {0, usec_timeout};
timeval tv = {0, usec_timeout}; // NOLINT
fd_set fds;
FD_ZERO(&fds); // NOLINT
FD_SET(STDIN_FILENO, &fds); // NOLINT
Expand Down
2 changes: 2 additions & 0 deletions src/ftxui/screen/color.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ std::string Color::Print(bool is_background_color) const {
";" + std::to_string(blue_);
}
}
// NOTREACHED();
return "";
}

/// @brief Build a transparent color.
Expand Down

0 comments on commit 8fbe852

Please sign in to comment.