diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..429403ef87d7ae7d43b459439e3e74fbc14bba18
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,161 @@
+name: Build
+
+on:
+ create:
+ tags:
+ -v*
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+
+jobs:
+ test:
+ name: "Tests"
+ strategy:
+ matrix:
+ include:
+ - 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
+
+ - name: "Enable MSVC command prompt"
+ if: matrix.os == 'windows-latest'
+ uses: ilammy/msvc-dev-cmd@v1
+
+ - name: "Install cmake"
+ uses: lukka/get-cmake@latest
+
+ - name: "Build debug mode"
+ run: >
+ mkdir build;
+ cd build;
+ cmake ..
+ -DCMAKE_CXX_COMPILER=${{ matrix.compiler }}
+ -DFTXUI_BUILD_DOCS=OFF
+ -DFTXUI_BUILD_EXAMPLES=ON
+ -DFTXUI_BUILD_TESTS=ON
+ -DFTXUI_BUILD_TESTS_FUZZER=OFF
+ -DFTXUI_ENABLE_INSTALL=ON ;
+ cmake --build . --config Debug;
+
+ - name: "Run tests"
+ if: matrix.test
+ run: >
+ cd build;
+ ./tests
+
+ # Create a release on new v* tags
+ release:
+ needs: test
+ if: ${{ github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v') }}
+ name: "Create release"
+ runs-on: ubuntu-latest
+ outputs:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ steps:
+ - name: "Create release"
+ uses: softprops/action-gh-release@v1
+ id: create_release
+ with:
+ draft: true
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ # Build artifact for the release
+ package:
+ name: "Build packages"
+ needs: release
+ strategy:
+ matrix:
+ include:
+ - os: ubuntu-latest
+ asset_path: build/ftxui*Linux*
+ - os: macos-latest
+ asset_path: build/ftxui*Darwin*
+ - os: windows-latest
+ asset_path: build/ftxui*Win64*
+ runs-on: ${{ matrix.os }}
+ steps:
+ - name: "Checkout repository"
+ uses: actions/checkout@v2
+
+ - name: "Install cmake"
+ uses: lukka/get-cmake@latest
+
+ - name: "Build packages"
+ run: >
+ mkdir build;
+ cd build;
+ cmake ..
+ -DCMAKE_BUILD_TYPE=Release
+ -DFTXUI_BUILD_DOCS=OFF
+ -DFTXUI_BUILD_EXAMPLES=OFF
+ -DFTXUI_BUILD_TESTS=OFF
+ -DFTXUI_BUILD_TESTS_FUZZER=OFF
+ -DFTXUI_ENABLE_INSTALL=ON;
+ cmake --build . --target package;
+ - uses: shogo82148/actions-upload-release-asset@v1
+ with:
+ upload_url: ${{ needs.release.outputs.upload_url }}
+ asset_path: ${{ matrix.asset_path }}
+ overwrite: true
+
+ documentation:
+ needs: package
+ runs-on: ubuntu-latest
+ steps:
+ - name: "Checkout repository"
+ uses: actions/checkout@v2
+
+ - name: "Install cmake"
+ uses: lukka/get-cmake@latest
+
+ - name: "Install emsdk"
+ uses: mymindstorm/setup-emsdk@v7
+
+ - name: "Install Doxygen/Graphviz"
+ run: >
+ sudo apt-get update;
+ sudo apt-get install doxygen graphviz;
+
+ - name: "Build documentation"
+ run: >
+ mkdir build;
+ cd build;
+ emcmake cmake ..;
+ cmake --build . --target doc;
+ rsync -amv --include='*/' --include='*.html' --include='*.js' --include='*.wasm' --exclude='*' examples doc/doxygen/html;
+
+ - name: "Deploy"
+ uses: peaceiris/actions-gh-pages@v3
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ publish_dir: build/doc/doxygen/html/
+ enable_jekyll: false
+ allow_empty_commit: false
+ force_orphan: true
+ publish_branch: gh-pages
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 33b47e37a204eb6dc00c782bbc39518cb7fb9ce2..0000000000000000000000000000000000000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
- push:
- branches: [ master ]
- pull_request:
- # The branches below must be a subset of the branches above
- branches: [ master ]
- schedule:
- - cron: '38 7 * * 4'
-
-jobs:
- analyze:
- name: Analyze
- runs-on: ubuntu-latest
- permissions:
- actions: read
- contents: read
- security-events: write
-
- strategy:
- fail-fast: false
- matrix:
- language: [ 'cpp' ]
- # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
- # Learn more:
- # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v2
-
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
- with:
- languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- # If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v1
-
- # âšī¸ Command-line programs to run using the OS shell.
- # đ https://git.io/JvXDl
-
- # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
-
- #- run: |
- # make bootstrap
- # make release
-
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/linux-clang.yaml b/.github/workflows/linux-clang.yaml
deleted file mode 100644
index fffe9940841dadb394e55f1ba8682772c5219458..0000000000000000000000000000000000000000
--- a/.github/workflows/linux-clang.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Linux Clang
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- build:
- name: Linux Clang
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: seanmiddleditch/gha-setup-ninja@master
- - name: Build
- run: >
- mkdir build;
- cd build;
- cmake ..
- -DCMAKE_CXX_COMPILER=clang++
- -DFTXUI_BUILD_TESTS=ON;
- cmake --build . --config Release;
-
- - name: Tests
- if: ${{ matrix.config.test }}
- run: >
- cd build;
- ./tests
diff --git a/.github/workflows/linux-emscripten.yaml b/.github/workflows/linux-emscripten.yaml
deleted file mode 100644
index a55eddc399b63ef02a4fc86ff3d90b9927a232cf..0000000000000000000000000000000000000000
--- a/.github/workflows/linux-emscripten.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Linux Emscripten
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- build:
- name: Linux Emscripten
- runs-on: ubuntu-latest
- env:
- DOCUMENTATION: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
- steps:
- - uses: actions/checkout@v2
- - uses: seanmiddleditch/gha-setup-ninja@master
- - uses: mymindstorm/setup-emsdk@v7
-
- - name: Install Doxygen/Graphviz
- if: fromJSON(env.DOCUMENTATION)
- run: |
- sudo apt-get update
- sudo apt-get install doxygen graphviz
-
- - name: Build
- run: |
- emcmake cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -S . -B build
- cmake --build build
-
- - name: Build documentation
- if: fromJSON(env.DOCUMENTATION)
- run: |
- cd build
- cmake --build . --target doc
- # Copy emscripten built examples to the doxygen output directory for deployment
- rsync -amv --include='*/' --include='*.html' --include='*.js' --include='*.wasm' --exclude='*' examples doc/doxygen/html
-
- # Deploy the HTML documentation to GitHub Pages
- - name: GH Pages Deployment
- if: fromJSON(env.DOCUMENTATION)
- uses: peaceiris/actions-gh-pages@v3
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
- publish_dir: build/doc/doxygen/html/
- enable_jekyll: false
- allow_empty_commit: false
- force_orphan: true
- publish_branch: gh-pages
diff --git a/.github/workflows/linux-gcc.yaml b/.github/workflows/linux-gcc.yaml
deleted file mode 100644
index f978b0bd0e0b2117ee6343ec8ae03cad167425ce..0000000000000000000000000000000000000000
--- a/.github/workflows/linux-gcc.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Linux GCC
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- build:
- name: Linux GCC
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: seanmiddleditch/gha-setup-ninja@master
- - name: Build
- run: >
- mkdir build;
- cd build;
- cmake ..
- -DCMAKE_CXX_COMPILER=g++-9
- -DFTXUI_BUILD_TESTS=ON;
- cmake --build . --config Release;
-
- - name: Tests
- run: >
- cd build;
- ./tests
diff --git a/.github/workflows/mac-clang.yaml b/.github/workflows/mac-clang.yaml
deleted file mode 100644
index bca56330b377d9bc560e6cf697cf5c14645295f9..0000000000000000000000000000000000000000
--- a/.github/workflows/mac-clang.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: MacOS Clang
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- build:
- name: MacOS Clang
- runs-on: macos-latest
- steps:
- - uses: actions/checkout@v2
- - uses: seanmiddleditch/gha-setup-ninja@master
- - name: Build
- run: >
- mkdir build;
- cd build;
- cmake ..
- -DCMAKE_CXX_COMPILER=clang++
- -DFTXUI_BUILD_TESTS=ON;
- cmake --build . --config Release;
-
- - name: Tests
- if: ${{ matrix.config.test }}
- run: >
- cd build;
- ./tests
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
deleted file mode 100644
index d241cbdbfa8e7640e1874c7e40122f5998e84b9e..0000000000000000000000000000000000000000
--- a/.github/workflows/release.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Release
-
-on:
- create:
- tags:
- -v*
-
-jobs:
- build:
- name: Release
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- with:
- fetch-depth: 0
-
- - uses: seanmiddleditch/gha-setup-ninja@master
-
- - name: Build
- run: >
- mkdir build;
- cd build;
- cmake ..
- -DCMAKE_CXX_COMPILER=clang++
- -DFTXUI_BUILD_DOCS=OFF
- -DFTXUI_BUILD_EXAMPLES=OFF
- -DFTXUI_BUILD_TESTS=OFF
- -DFTXUI_BUILD_TESTS_FUZZER=OFF
- -DFTXUI_ENABLE_INSTALL=ON;
- cmake --build . --config Release;
- make package;
-
- - name: Upload
- uses: softprops/action-gh-release@v1
- with:
- files: build/ftxui-*
- draft: true
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/windows-msvc.yaml b/.github/workflows/windows-msvc.yaml
deleted file mode 100644
index d2b08deb9e7723bf7cd01bd953f26c210e3d2ead..0000000000000000000000000000000000000000
--- a/.github/workflows/windows-msvc.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Windows MSVC
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- build:
- name: Windows MSVC
- runs-on: windows-latest
- steps:
- - uses: actions/checkout@v2
- - uses: seanmiddleditch/gha-setup-ninja@master
- - uses: ilammy/msvc-dev-cmd@v1
- - name: Build
- run: >
- mkdir build;
- cd build;
- cmake ..
- -DCMAKE_CXX_COMPILER="cl"
- -DFTXUI_BUILD_TESTS=ON;
- cmake --build . --config Release;
-
- - name: Tests
- if: ${{ matrix.config.test }}
- run: >
- cd build;
- ./tests.exe
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd47c9458b6d8df7353b205db4be9c93ca5657cf..76cc0bbca6f5945f640bb18ff7a98e880dee54a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,20 @@
Changelog
=========
-Unreleased (development)
+released (development)
------------------------
+0.11
+----
+
+## github workflow
+- Add Windows ad MacOS artefacts.
+- Merge all the workflows.
+
## Bug
- On Unix system, fallback to {80,25} screen dimension on failure.
## CMake
-Added:
- Support for shared library, via `BUILD_SHARED_LIBS` option.
- Add library version and symlinks.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be086d8ac06a72ac4d0fb982d42968270ce682ec..166fb39cd1d8bbbd37622c93e3248e7960c534eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ include(cmake/ftxui_git_version.cmake)
project(ftxui
LANGUAGES CXX
- VERSION 0.10.${git_version}
+ VERSION 0.11.${git_version}
)
option(FTXUI_BUILD_DOCS "Set to ON to build tests" ON)
diff --git a/README.md b/README.md
index 1890d28be98f8501c940534a58d09743135ea9b1..2895e152ff73f82ef7f292f64f3228817b2188de 100644
--- a/README.md
+++ b/README.md
@@ -35,23 +35,11 @@ A simple C++ library for terminal based user interface.
* Keyboard & mouse navigation.
## Operating systems
-- [![linux-emscripten][badge.linux-emscripten]][link.linux-emscripten]
-- [![linux-gcc][badge.linux-gcc]][link.linux-gcc]
-[![linux-clang][badge.linux-clang]][link.linux-clang]
-- [![windows-msvc][badge.windows-msvc]][link.windows-msvc]
-- [![mac-clang][badge.mac-clang]][link.mac-clang]
-
-[badge.linux-gcc]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/linux-gcc.yaml/badge.svg?branch=master
-[badge.linux-clang]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/linux-clang.yaml/badge.svg?branch=master
-[badge.linux-emscripten]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/linux-emscripten.yaml/badge.svg?branch=master
-[badge.windows-msvc]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/windows-msvc.yaml/badge.svg?branch=master
-[badge.mac-clang]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/mac-clang.yaml/badge.svg?branch=master
-
-[link.linux-gcc]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/linux-gcc.yaml
-[link.linux-clang]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/linux-clang.yaml
-[link.linux-emscripten]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/linux-emscripten.yaml
-[link.windows-msvc]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/windows-msvc.yaml
-[link.mac-clang]: https://github.com/ArthurSonzogni/FTXUI/actions/workflows/mac-clang.yaml
+
+- Webassembly
+- Linux
+- MacOS
+- Windows
## Example
~~~cpp
diff --git a/cmake/ftxui_package.cmake b/cmake/ftxui_package.cmake
index c5e5250fbb60a665079161d5ecdda7cd1c43e452..cc20cb38d4eda41c396000155bb515ddf0cd778a 100644
--- a/cmake/ftxui_package.cmake
+++ b/cmake/ftxui_package.cmake
@@ -1,4 +1,12 @@
-set(CPACK_GENERATOR "DEB;External;RPM;STGZ;TBZ2;TGZ;TXZ;TZ;TZST;ZIP")
+if (UNIX AND NOT APPLE)
+ set(CPACK_GENERATOR "DEB;External;RPM;STGZ;TBZ2;TGZ;TXZ;TZ;TZST;ZIP")
+elseif (UNIX AND APPLE)
+ set(CPACK_GENERATOR "DragNDrop;NuGet;TGZ;ZIP")
+elseif (WIN32)
+ set(CPACK_GENERATOR "DEB;NuGet;TGZ;ZIP")
+else()
+ set(CPACK_GENERATOR "ZIP")
+endif()
set(CPACK_DEBIAN_PACKAGE_DEPENDS " ")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE_URL "https://github.com/ArthurSonzogni/FTXUI/")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Arthur Sonzogni")