From 059b4f7d7087d9f16cc781ccfce3a52247905ff3 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Wed, 16 Apr 2025 11:30:42 -0400 Subject: [PATCH] okay now that I've rewritten history, selectively for amd64 we'll build TUI in the workflow (arm, arm64 and armhf all don't support it via automatic workflow build right now, anyone got any ideas?); --- .github/workflows/build.yml | 9 +++++++-- .github/workflows/release.yml | 14 ++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26a0acdd..5eff314c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,10 +70,15 @@ jobs: g++-arm-linux-gnueabihf \ gcc-arm-linux-gnueabihf \ g++-aarch64-linux-gnu \ - libasio-dev libssl-dev + libasio-dev libssl-dev libncurses-dev - name: Build run: | - build_args='-DENABLE_TUI_SUPPORT=0' + build_args='' + if [[ "${{ matrix.arch }}" == 'amd64' ]]; then + build_args='-DENABLE_TUI_SUPPORT=1' + else + build_args='-DENABLE_TUI_SUPPORT=0' + fi if [[ "${{ github.event_name }}" == 'push' ]]; then build_args="$build_args -DCMAKE_BUILD_TYPE=${{ inputs.build_type }}" if [[ "${{ inputs.strip_symbols }}" == 'true' ]]; then diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4f0f514c..6faed14d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: g++-arm-linux-gnueabihf \ gcc-arm-linux-gnueabihf \ g++-aarch64-linux-gnu \ - libasio-dev libssl-dev + libasio-dev libssl-dev libncurses-dev - name: Build run: | if [[ "${{ matrix.arch }}" == 'armhf' ]]; then @@ -56,9 +56,15 @@ jobs: -DENABLE_TUI_SUPPORT=0 \ -DCROSS_COMPILE_RPI_ARM=1 . else - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-s" -DCMAKE_CXX_FLAGS="-s" \ - -DENABLE_TUI_SUPPORT=0 \ - -D "CROSS_COMPILE_$(echo '${{ matrix.arch }}' | tr '[:lower:]' '[:upper:]')=1" . + if [[ "${{ github.event_name }}" == 'amd64' ]]; then + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-s" -DCMAKE_CXX_FLAGS="-s" \ + -DENABLE_TUI_SUPPORT=1 \ + -D "CROSS_COMPILE_$(echo '${{ matrix.arch }}' | tr '[:lower:]' '[:upper:]')=1" . + else + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-s" -DCMAKE_CXX_FLAGS="-s" \ + -DENABLE_TUI_SUPPORT=0 \ + -D "CROSS_COMPILE_$(echo '${{ matrix.arch }}' | tr '[:lower:]' '[:upper:]')=1" . + fi fi make -j $(nproc)