diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index d5dcc44..c906ddc 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -4,9 +4,9 @@ name: CMake on multiple platforms on: push: - branches: [ "main" ] + branches: ["main"] pull_request: - branches: [ "main", "*" ] + branches: ["main", "*"] jobs: build: @@ -23,40 +23,24 @@ jobs: # # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest] build_type: [Release] - c_compiler: [gcc, clang, cl] - include: - # windows - - os: windows-latest - c_compiler: cl - cpp_compiler: cl - # ubuntu - - os: ubuntu-latest - c_compiler: gcc - cpp_compiler: g++ - - os: ubuntu-latest - c_compiler: clang - cpp_compiler: clang++ - # macos - - os: macos-latest - c_compiler: gcc - cpp_compiler: g++ - - os: macos-latest - c_compiler: clang - cpp_compiler: clang++ + cpp_compiler: [g++, clang++, cl] exclude: # windows - os: windows-latest - c_compiler: gcc + cpp_compiler: g++ - os: windows-latest - c_compiler: clang + cpp_compiler: clang++ # ubuntu - os: ubuntu-latest - c_compiler: cl + cpp_compiler: cl + # ubuntu + - os: ubuntu-24.04-arm + cpp_compiler: cl # macos - os: macos-latest - c_compiler: cl + cpp_compiler: cl steps: - uses: actions/checkout@v4 @@ -74,7 +58,6 @@ jobs: run: > cmake -B ${{ steps.strings.outputs.build-output-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} - -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} @@ -83,19 +66,12 @@ jobs: run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} - name: Upload example executables - if: ${{ runner.os == 'Windows' }} - uses: actions/upload-artifact@v4 - with: - name: examples_${{ matrix.os }}_${{ matrix.c_compiler }} - path: ${{ steps.strings.outputs.build-output-dir }}/Release/* - - - name: Upload example executables - if: ${{ runner.os != 'Windows' }} uses: actions/upload-artifact@v4 with: - name: examples_${{ matrix.os }}_${{ matrix.c_compiler }} + name: cpptui-examples_${{ runner.os }}_${{ runner.arch }}_${{ matrix.cpp_compiler }} path: | ${{ steps.strings.outputs.build-output-dir }}/* !${{ steps.strings.outputs.build-output-dir }}/*/* !${{ steps.strings.outputs.build-output-dir }}/*.* !${{ steps.strings.outputs.build-output-dir }}/*Makefile + ${{ steps.strings.outputs.build-output-dir }}/Release/* diff --git a/examples/snake.cpp b/examples/snake.cpp index b241856..0481ed2 100644 --- a/examples/snake.cpp +++ b/examples/snake.cpp @@ -340,7 +340,7 @@ int main() { } catch (...) { tui::reset(); - std::cerr << "unknown error occured\n"; + std::cerr << "unknown error occurred\n"; return 1; } diff --git a/tui.hpp b/tui.hpp index 2865f66..37be957 100644 --- a/tui.hpp +++ b/tui.hpp @@ -42,7 +42,7 @@ namespace tui { #define csi_fn(name, ...) \ inline void name() { csi(__VA_ARGS__) } -// ANSII Escape Sequnce +// ANSII Escape Sequence #define esc(...) std::cout << concat("\x1B", __VA_ARGS__); // function using ANSII Escape Sequence #define esc_fn(name, ...) \