Skip to content

Commit 25492c9

Browse files
authored
ci: add ubuntu-24.04-arm (#48)
* ci: add ubuntu-24.04-arm * ci: simplify upload * ci(refactor): don't in-, just exclude * typo: eliminate --------- Co-authored-by: Jeromos Kovács <[email protected]>
1 parent fb86d3d commit 25492c9

File tree

3 files changed

+15
-39
lines changed

3 files changed

+15
-39
lines changed

.github/workflows/cmake-multi-platform.yml

Lines changed: 13 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: CMake on multiple platforms
44

55
on:
66
push:
7-
branches: [ "main" ]
7+
branches: ["main"]
88
pull_request:
9-
branches: [ "main", "*" ]
9+
branches: ["main", "*"]
1010

1111
jobs:
1212
build:
@@ -23,40 +23,24 @@ jobs:
2323
#
2424
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
2525
matrix:
26-
os: [ubuntu-latest, macos-latest, windows-latest]
26+
os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest]
2727
build_type: [Release]
28-
c_compiler: [gcc, clang, cl]
29-
include:
30-
# windows
31-
- os: windows-latest
32-
c_compiler: cl
33-
cpp_compiler: cl
34-
# ubuntu
35-
- os: ubuntu-latest
36-
c_compiler: gcc
37-
cpp_compiler: g++
38-
- os: ubuntu-latest
39-
c_compiler: clang
40-
cpp_compiler: clang++
41-
# macos
42-
- os: macos-latest
43-
c_compiler: gcc
44-
cpp_compiler: g++
45-
- os: macos-latest
46-
c_compiler: clang
47-
cpp_compiler: clang++
28+
cpp_compiler: [g++, clang++, cl]
4829
exclude:
4930
# windows
5031
- os: windows-latest
51-
c_compiler: gcc
32+
cpp_compiler: g++
5233
- os: windows-latest
53-
c_compiler: clang
34+
cpp_compiler: clang++
5435
# ubuntu
5536
- os: ubuntu-latest
56-
c_compiler: cl
37+
cpp_compiler: cl
38+
# ubuntu
39+
- os: ubuntu-24.04-arm
40+
cpp_compiler: cl
5741
# macos
5842
- os: macos-latest
59-
c_compiler: cl
43+
cpp_compiler: cl
6044

6145
steps:
6246
- uses: actions/checkout@v4
@@ -74,7 +58,6 @@ jobs:
7458
run: >
7559
cmake -B ${{ steps.strings.outputs.build-output-dir }}
7660
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
77-
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
7861
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
7962
-S ${{ github.workspace }}
8063
@@ -83,19 +66,12 @@ jobs:
8366
run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
8467

8568
- name: Upload example executables
86-
if: ${{ runner.os == 'Windows' }}
87-
uses: actions/upload-artifact@v4
88-
with:
89-
name: examples_${{ matrix.os }}_${{ matrix.c_compiler }}
90-
path: ${{ steps.strings.outputs.build-output-dir }}/Release/*
91-
92-
- name: Upload example executables
93-
if: ${{ runner.os != 'Windows' }}
9469
uses: actions/upload-artifact@v4
9570
with:
96-
name: examples_${{ matrix.os }}_${{ matrix.c_compiler }}
71+
name: cpptui-examples_${{ runner.os }}_${{ runner.arch }}_${{ matrix.cpp_compiler }}
9772
path: |
9873
${{ steps.strings.outputs.build-output-dir }}/*
9974
!${{ steps.strings.outputs.build-output-dir }}/*/*
10075
!${{ steps.strings.outputs.build-output-dir }}/*.*
10176
!${{ steps.strings.outputs.build-output-dir }}/*Makefile
77+
${{ steps.strings.outputs.build-output-dir }}/Release/*

examples/snake.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ int main() {
340340

341341
} catch (...) {
342342
tui::reset();
343-
std::cerr << "unknown error occured\n";
343+
std::cerr << "unknown error occurred\n";
344344
return 1;
345345
}
346346

tui.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace tui {
4242
#define csi_fn(name, ...) \
4343
inline void name() { csi(__VA_ARGS__) }
4444

45-
// ANSII Escape Sequnce
45+
// ANSII Escape Sequence
4646
#define esc(...) std::cout << concat("\x1B", __VA_ARGS__);
4747
// function using ANSII Escape Sequence
4848
#define esc_fn(name, ...) \

0 commit comments

Comments
 (0)