Skip to content

Commit 925e8d5

Browse files
ProgramMaxProgramMax
authored
Update CI script (#87)
1 parent 7195b3a commit 925e8d5

16 files changed

Lines changed: 44 additions & 32 deletions

‎.github/workflows/build-and-test.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
platform: [Win32, x64]
1717
configuration: [Debug, Release]
18-
runner: [windows-2022] # TODO: Add windows-2019, which errors on Platform Toolset = 'v143' missing.
18+
runner: [windows-2025-vs2026, windows-11-vs2026-arm]
1919
runs-on: ${{ matrix.runner }}
2020

2121
steps:
@@ -38,9 +38,9 @@ jobs:
3838
Linux:
3939
strategy:
4040
matrix:
41-
platform: [X86-64] # TODO: Add X86, AArch32, and AArch64 platforms
41+
platform: [X86-64]
4242
compiler: [Clang, GCC]
43-
runner: [ubuntu-22.04, ubuntu-20.04]
43+
runner: [ubuntu-26.04, ubuntu-24.04, ubuntu-22.04,] # TODO: Add these once ARM builds are working: ubuntu-26.04-arm, ubuntu-24.04-arm, ubuntu-22.04-arm
4444
runs-on: ${{ matrix.runner }}
4545

4646
steps:
@@ -57,6 +57,7 @@ jobs:
5757
sudo apt update
5858
sudo apt install qtbase5-dev
5959
60+
# This is useful for finding the include path on different systems
6061
- name: Find Qt
6162
run: |
6263
find /usr/include -name QWidget

‎Code/maxGUI/ButtonImplementation.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef MAXGUI_BUTTONIMPLEMENTATION_HPP
66
#define MAXGUI_BUTTONIMPLEMENTATION_HPP
77

8+
#include <cstdint>
89
#include <string>
910

1011
#include <max/Compiling/Bitmask.hpp>

‎Code/maxGUI/CheckBoxImplementation.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef MAXGUI_CHECKBOXIMPLEMENTATION_HPP
66
#define MAXGUI_CHECKBOXIMPLEMENTATION_HPP
77

8+
#include <cstdint>
89
#include <string>
910

1011
#include <max/Compiling/Bitmask.hpp>

‎Code/maxGUI/DropDownBoxImplementation.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef MAXGUI_DROPDOWNBOXIMPLEMENTATION_HPP
66
#define MAXGUI_DROPDOWNBOXIMPLEMENTATION_HPP
77

8+
#include <cstdint>
89
#include <string>
910
#include <vector>
1011

‎Code/maxGUI/ListBoxImplementation.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef MAXGUI_LISTBOXIMPLEMENTATION_HPP
66
#define MAXGUI_LISTBOXIMPLEMENTATION_HPP
77

8+
#include <cstdint>
89
#include <string>
910
#include <vector>
1011

‎Code/maxGUI/MultilineTextBoxImplementation.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef MAXGUI_MULTILINETEXTBOXIMPLEMENTATION_HPP
66
#define MAXGUI_MULTILINETEXTBOXIMPLEMENTATION_HPP
77

8+
#include <cstdint>
89
#include <string>
910

1011
#include <max/Compiling/Bitmask.hpp>

‎Code/maxGUI/RadioButtonImplementation.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef MAXGUI_RADIOBUTTONIMPLEMENTATION_HPP
66
#define MAXGUI_RADIOBUTTONIMPLEMENTATION_HPP
77

8+
#include <cstdint>
89
#include <string>
910

1011
#include <max/Compiling/Bitmask.hpp>

‎Code/maxGUI/TextBoxImplementation.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef MAXGUI_TEXTBOXIMPLEMENTATION_HPP
66
#define MAXGUI_TEXTBOXIMPLEMENTATION_HPP
77

8+
#include <cstdint>
89
#include <string>
910

1011
#include <max/Compiling/Bitmask.hpp>

‎Projects/Make/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ INCLUDE_PATHS = \
3333
/usr/include/x86_64-linux-gnu/qt5/QtWidgets \
3434
/usr/include/x86_64-linux-gnu/qt5 \
3535
/usr/include/x86_64-linux-gnu/QtCore \
36-
/usr/include/x86_64-linux-gnu/QtGui
36+
/usr/include/x86_64-linux-gnu/QtGui \
37+
/usr/include/aarch64-linux-gnu/qt5/QtWidgets \
38+
/usr/include/aarch64-linux-gnu/qt5 \
39+
/usr/include/aarch64-linux-gnu/QtCode \
40+
/usr/include/aarch64-linux-gnu/QtGui
3741
INCLUDE_PATHS_FLAGS = $(foreach d, $(INCLUDE_PATHS), -I$d)
3842

3943
LIBRARY_PATHS = \

‎Projects/VisualStudio/ControlGalleryExample/ControlGalleryExample.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3333
<ConfigurationType>Application</ConfigurationType>
3434
<UseDebugLibraries>true</UseDebugLibraries>
35-
<PlatformToolset>v143</PlatformToolset>
35+
<PlatformToolset>v145</PlatformToolset>
3636
<CharacterSet>Unicode</CharacterSet>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
4040
<UseDebugLibraries>false</UseDebugLibraries>
41-
<PlatformToolset>v143</PlatformToolset>
41+
<PlatformToolset>v145</PlatformToolset>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
4343
<CharacterSet>Unicode</CharacterSet>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4646
<ConfigurationType>Application</ConfigurationType>
4747
<UseDebugLibraries>true</UseDebugLibraries>
48-
<PlatformToolset>v143</PlatformToolset>
48+
<PlatformToolset>v145</PlatformToolset>
4949
<CharacterSet>Unicode</CharacterSet>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5252
<ConfigurationType>Application</ConfigurationType>
5353
<UseDebugLibraries>false</UseDebugLibraries>
54-
<PlatformToolset>v143</PlatformToolset>
54+
<PlatformToolset>v145</PlatformToolset>
5555
<WholeProgramOptimization>true</WholeProgramOptimization>
5656
<CharacterSet>Unicode</CharacterSet>
5757
</PropertyGroup>

0 commit comments

Comments
 (0)