From 0a5e9f2a2f7a2f9ecfbdee0b01d8fc39ae78dbd7 Mon Sep 17 00:00:00 2001 From: ArthurSonzogni Date: Thu, 30 Sep 2021 21:13:16 +0200 Subject: [PATCH] Add workflow creating releases. --- .github/workflows/release.yaml | 39 ++++++++++++++++++++++++++++++++++ CHANGELOG.md | 7 +++++- CMakeLists.txt | 12 ++++++----- cmake/ftxui_package.cmake | 16 ++++++++++++++ 4 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/release.yaml create mode 100644 cmake/ftxui_package.cmake diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..b35931f --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,39 @@ +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: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 03ffb62..137957f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,13 @@ ## Current +## 0.10 (2021-09-30) + +## Bug +- Fix the automated merge of borders. + ### Dom - - `vscroll_indicator`. Show a scrollback indicator on the right. + - `vscroll_indicator`. Show a scrollbar indicator on the right. ### Component - `Maybe`: Display an component conditionnally based on a boolean. diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f411d3..7313ef6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ include(cmake/ftxui_git_version.cmake) project(ftxui LANGUAGES CXX - VERSION 0.9.${git_version} + VERSION 0.10.${git_version} ) option(FTXUI_BUILD_DOCS "Set to ON to build tests" ON) @@ -123,10 +123,6 @@ if (FTXUI_BUILD_TESTS AND ${CMAKE_VERSION} VERSION_GREATER "3.11.4") include(cmake/ftxui_test.cmake) endif() -if(FTXUI_ENABLE_INSTALL) - include(cmake/ftxui_install.cmake) -endif() - if(FTXUI_BUILD_EXAMPLES) add_subdirectory(examples) endif() @@ -137,3 +133,9 @@ endif() include(cmake/iwyu.cmake) include(cmake/ftxui_export.cmake) + +if(FTXUI_ENABLE_INSTALL) + include(cmake/ftxui_install.cmake) + include(cmake/ftxui_package.cmake) +endif() + diff --git a/cmake/ftxui_package.cmake b/cmake/ftxui_package.cmake new file mode 100644 index 0000000..c5e5250 --- /dev/null +++ b/cmake/ftxui_package.cmake @@ -0,0 +1,16 @@ +set(CPACK_GENERATOR "DEB;External;RPM;STGZ;TBZ2;TGZ;TXZ;TZ;TZST;ZIP") +set(CPACK_DEBIAN_PACKAGE_DEPENDS " ") +set(CPACK_DEBIAN_PACKAGE_HOMEPAGE_URL "https://github.com/ArthurSonzogni/FTXUI/") +set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Arthur Sonzogni") +set(CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION}) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A simple C++ Terminal UI library") +set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/ArthurSonzogni/FTXUI/") +set(CPACK_PACKAGE_NAME "ftxui") +set(CPACK_PACKAGE_VENDOR "Arthur Sonzogni") +set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) +set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") + +include(CPack)