Skip to content

Commit

Permalink
Fix workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurSonzogni committed Oct 18, 2021
1 parent 79c8993 commit 22385a8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,25 @@ jobs:
- name: Linux GCC
os: ubuntu-latest
compiler: g++-9
test: true

- name: Linux Clang
os: ubuntu-latest
compiler: clang++
test: true

- name: MacOS clang
os: macos-latest
compiler: clang++
test: true

- name: Windows MSVC
os: windows-latest
compiler: cl
test: false

runs-on: ${{ matrix.os }}
steps:
- name: "Checkout repository"
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: "Enable MSVC command prompt"
if: matrix.os == 'windows-latest'
Expand All @@ -59,12 +57,6 @@ jobs:
-DCMAKE_BUILD_TYPE=Debug;
cmake --build . --target git-tui;
- name: "Run tests"
if: matrix.test
run: >
cd build;
./tests
# Create a release on new v* tags
release:
needs: test
Expand Down Expand Up @@ -99,6 +91,8 @@ jobs:
steps:
- name: "Checkout repository"
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: "Install cmake"
uses: lukka/get-cmake@latest
Expand All @@ -107,7 +101,7 @@ jobs:
run: >
mkdir build;
cd build;
cmake .. -DCMAKE_BUILD_TYPE=Release
cmake .. -DCMAKE_BUILD_TYPE=Release;
cmake --build . --target package;
- uses: shogo82148/actions-upload-release-asset@v1
with:
Expand Down
6 changes: 6 additions & 0 deletions src/diff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
#include "subprocess/ProcessBuilder.hpp" // for RunBuilder, run
#include "subprocess/basic_types.hpp" // for PipeOption, PipeOption::pipe, CompletedProcess, PipeOption::close

#ifdef RGB
// Workaround for wingdi.h (via Windows.h) defining macros that break things.
// https://docs.microsoft.com/en-us/windows/win32/api/wingdi/nf-wingdi-rgb
#undef RGB
#endif

using namespace ftxui;

namespace gittui::diff {
Expand Down

0 comments on commit 22385a8

Please sign in to comment.