From dc7b523e1ea817e9d79cb8118840a015fc64b277 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Tue, 8 Jul 2025 22:39:29 -0500 Subject: [PATCH 01/35] set -ferror-limit=0 on clang to prevent errors in clangd --- cmake/hyperion_compiler_settings.cmake | 2 +- xmake/hyperion_compiler_settings.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/hyperion_compiler_settings.cmake b/cmake/hyperion_compiler_settings.cmake index c390b4b..0ec565c 100644 --- a/cmake/hyperion_compiler_settings.cmake +++ b/cmake/hyperion_compiler_settings.cmake @@ -46,7 +46,7 @@ function(hyperion_compile_settings TARGET) endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMILER_ID STREQUAL "clang") - target_compile_options(${TARGET} ${PUBLIC_VISIBILITY} -fsized-deallocation) + target_compile_options(${TARGET} ${PUBLIC_VISIBILITY} -fsized-deallocation -ferror-limit=0) endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMILER_ID STREQUAL "clang") diff --git a/xmake/hyperion_compiler_settings.lua b/xmake/hyperion_compiler_settings.lua index 7aa604b..88e7a83 100644 --- a/xmake/hyperion_compiler_settings.lua +++ b/xmake/hyperion_compiler_settings.lua @@ -50,6 +50,7 @@ local function _set_compile_options(target) target:add("cxflags", "/sdl", { public = false }) elseif target:has_tool("cxx", "clang", "clang++") then target:add("cxflags", "-fsized-deallocation", { public = true }) + target:add("cxflags", "-ferror-limit=0", { public = true }) end end From 2880c7329f8210b75d158394d72b16605da3e7c0 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Tue, 8 Jul 2025 22:51:08 -0500 Subject: [PATCH 02/35] Fix CI? --- .github/workflows/cmake.yml | 15 ++++++++++----- .github/workflows/xmake.yml | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 66438c0..023fe96 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [12, 13] + version: [12, 13, 14, 15] fail-fast: false steps: - uses: actions/checkout@v4 @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [15, 16, 17, 18] + version: [15, 16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -60,11 +60,16 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh ${{matrix.version}} - sudo apt-get -y install clang-tidy-${{matrix.version}} + sudo ./llvm.sh all + sudo apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} clang-tidy-${{matrix.version}} - name: Replace clang-tidy - run: sudo cp /usr/bin/clang-tidy-${{matrix.version}} /usr/bin/clang-tidy -f + run: | + if [[ "$(realpath --canonicalize-existing /usr/bin/clang-tidy-${{matrix.version}})" \ + != "$(realpath --canonicalize-existing /usr/bin/clang-tidy)" \ + ]]; then + sudo cp /usr/bin/clang-tidy-${{matrix.version}} /usr/bin/clang-tidy -f + fi - name: Configure env: diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 69c31ed..e7f7e86 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [12, 13] + version: [12, 13, 14, 15] fail-fast: false steps: - uses: actions/checkout@v4 @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [15, 16, 17, 18] + version: [15, 16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -79,11 +79,16 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh ${{matrix.version}} - sudo apt-get -y install clang-tidy-${{matrix.version}} + sudo ./llvm.sh all + sudo apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} clang-tidy-${{matrix.version}} - name: Replace clang-tidy - run: sudo cp /usr/bin/clang-tidy-${{matrix.version}} /usr/bin/clang-tidy -f + run: | + if [[ "$(realpath --canonicalize-existing /usr/bin/clang-tidy-${{matrix.version}})" \ + != "$(realpath --canonicalize-existing /usr/bin/clang-tidy)" \ + ]]; then + sudo cp /usr/bin/clang-tidy-${{matrix.version}} /usr/bin/clang-tidy -f + fi - name: Configure working-directory: ${{github.workspace}} From d925ce9c0c2d8fe0462c13a291b4d30604e541ea Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Tue, 8 Jul 2025 22:53:16 -0500 Subject: [PATCH 03/35] Fix CI? --- .github/workflows/cmake.yml | 2 +- .github/workflows/xmake.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 023fe96..0195119 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [12, 13, 14, 15] + version: [12, 13, 14] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index e7f7e86..b375f95 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [12, 13, 14, 15] + version: [12, 13, 14] fail-fast: false steps: - uses: actions/checkout@v4 From e00a8d499dbb6502ef62d81f2f8b5c253782945b Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Tue, 8 Jul 2025 23:00:45 -0500 Subject: [PATCH 04/35] Fix CI? --- .github/workflows/cmake.yml | 8 ++++++-- .github/workflows/xmake.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 0195119..d6df592 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -60,8 +60,12 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh all - sudo apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} clang-tidy-${{matrix.version}} + if [[ ${{matrix.version}} == 20 \ + ]]; then + sudo ./llvm.sh ${{matrix.version}} + else + sudo apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} clang-tidy-${{matrix.version}} + fi - name: Replace clang-tidy run: | diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index b375f95..2a7faef 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -79,8 +79,12 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh all - sudo apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} clang-tidy-${{matrix.version}} + if [[ ${{matrix.version}} == 20 \ + ]]; then + sudo ./llvm.sh ${{matrix.version}} + else + sudo apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} clang-tidy-${{matrix.version}} + fi - name: Replace clang-tidy run: | From a2dc3e4f7cf24e5f212b677b7afdd4896eb9b565 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Tue, 8 Jul 2025 23:17:26 -0500 Subject: [PATCH 05/35] Drop llvm 15 support and fix(?) llvm20 --- .github/workflows/cmake.yml | 3 ++- .github/workflows/xmake.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index d6df592..f580254 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [15, 16, 17, 18, 19, 20] + version: [16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -63,6 +63,7 @@ jobs: if [[ ${{matrix.version}} == 20 \ ]]; then sudo ./llvm.sh ${{matrix.version}} + sudo apt-get install -y clang-tidy-${{matrix.version}} else sudo apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} clang-tidy-${{matrix.version}} fi diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 2a7faef..9895119 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [15, 16, 17, 18, 19, 20] + version: [16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -82,6 +82,7 @@ jobs: if [[ ${{matrix.version}} == 20 \ ]]; then sudo ./llvm.sh ${{matrix.version}} + sudo apt-get install -y clang-tidy-${{matrix.version}} else sudo apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} clang-tidy-${{matrix.version}} fi From 78fb39d21f3f2d64432c20e7cf56aee0c0d11462 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Tue, 8 Jul 2025 23:22:17 -0500 Subject: [PATCH 06/35] Fix clang 19 build with xmake --- xmake/hyperion_compiler_settings.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xmake/hyperion_compiler_settings.lua b/xmake/hyperion_compiler_settings.lua index 88e7a83..ab47546 100644 --- a/xmake/hyperion_compiler_settings.lua +++ b/xmake/hyperion_compiler_settings.lua @@ -15,7 +15,12 @@ end local function _set_compile_options(target) if is_mode("release") then - target:set("optimize", "aggressive") + if target:has_tool("cxx", "clang", "clang++") then + -- clang 19 deprecates -Ofast, so just use -O3 on clang + target:set("optimize", "fastest") + else + target:set("optimize", "aggressive") + end if target:has_tool("cxx", "cl") then -- do not enable avx512 on MSVC is it has an optimizer error -- that will cause a crash due to misalignment From 82fed5ee0db850cd283672dee4854ef19cd460cf Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Tue, 8 Jul 2025 23:24:33 -0500 Subject: [PATCH 07/35] Fix docs build?\ --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c772760..233a7a3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -19,7 +19,7 @@ jobs: run: sudo apt-get -y install graphviz - name: Install LibGS - run: sudo apt-get -y install libgs9 libgs9-common + run: sudo apt-get -y install libgs libgs-common - name: Install GCC 12 run: sudo apt-get -y install gcc-12 From 49b4c99a41111996beb3a59d3efc3425bfaf758d Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Tue, 8 Jul 2025 23:28:38 -0500 Subject: [PATCH 08/35] Fix docs build? --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 233a7a3..b169b8e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -19,7 +19,7 @@ jobs: run: sudo apt-get -y install graphviz - name: Install LibGS - run: sudo apt-get -y install libgs libgs-common + run: sudo apt-get -y install libgs10 libgs10-common - name: Install GCC 12 run: sudo apt-get -y install gcc-12 From d4f02c7651bd7f095b7530864d8588f6c9183758 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 19:52:30 -0500 Subject: [PATCH 09/35] Fix windows XMake build? --- .github/workflows/xmake.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 9895119..7f0f071 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -153,9 +153,6 @@ jobs: - name: Install XMake run: | scoop install xmake - xmake update -sfy master - Start-Sleep -Seconds 2 - xmake update -fy master - name: Configure working-directory: ${{github.workspace}} From 07d9acfcc3c4a1f6aafc16a202cd32ef4b79f1c5 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 19:54:57 -0500 Subject: [PATCH 10/35] change llvm versions in CI --- .github/workflows/cmake.yml | 4 ++-- .github/workflows/xmake.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f580254..5a4abeb 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [16, 17, 18, 19, 20] + version: [15, 16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -142,7 +142,7 @@ jobs: runs-on: macos-latest strategy: matrix: - version: [15, 16, 17, 18] + version: [15, 16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 7f0f071..44a7440 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [16, 17, 18, 19, 20] + version: [15, 16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -189,7 +189,7 @@ jobs: runs-on: macos-13 strategy: matrix: - version: [15, 16, 17, 18] + version: [15, 16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 From b0221881b55f30f8f57aa7149a328c51f406b45a Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:06:24 -0500 Subject: [PATCH 11/35] Drop llvm 15 from CI --- .clang-tidy | 1 - .github/workflows/cmake.yml | 4 ++-- .github/workflows/xmake.yml | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index e5c0717..390862f 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -2,7 +2,6 @@ Checks: 'cert-*,clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,hicpp-*,google-*,misc-*,modernize-*,performance-*,portability-*,readability-*,bugprone-*,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-google-readability-casting,-clang-analyzer-optin.cplusplus.UninitializedObject,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-core.NullDereference' WarningsAsErrors: 'cert-*,clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,hicpp-*,google-*,misc-*,modernize-*,performance-*,portability-*,readability-*,bugprone-*,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-google-readability-casting,-clang-analyzer-optin.cplusplus.UninitializedObject,-clang-analyzer-cplusplus.NewDeleteLeaks,-misc-include-cleaner,-clang-analyzer-core.NullDereference' HeaderFilterRegex: '(hyperion)$' -AnalyzeTemporaryDtors: true FormatStyle: none User: braxton UseColor: true diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 5a4abeb..fc2139e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [15, 16, 17, 18, 19, 20] + version: [16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -142,7 +142,7 @@ jobs: runs-on: macos-latest strategy: matrix: - version: [15, 16, 17, 18, 19, 20] + version: [16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 44a7440..880da96 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [15, 16, 17, 18, 19, 20] + version: [16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -189,7 +189,7 @@ jobs: runs-on: macos-13 strategy: matrix: - version: [15, 16, 17, 18, 19, 20] + version: [16, 17, 18, 19, 20] fail-fast: false steps: - uses: actions/checkout@v4 @@ -210,7 +210,7 @@ jobs: - name: Configure working-directory: ${{github.workspace}} - run: xmake f -c -y --toolchain=clang --hyperion_enable_tracy=y + run: xmake f -c -y --toolchain=clang-{{matrix.version}} --hyperion_enable_tracy=y - name: Build env: @@ -237,6 +237,6 @@ jobs: run: | xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git" xrepo update-repo -y - xrepo install -y --toolchain=clang "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" - xrepo install -y --toolchain=clang --configs="hyperion_enable_tracy=true" "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" + xrepo install -y --toolchain=clang-{{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" + xrepo install -y --toolchain=clang-{{matrix.version}} --configs="hyperion_enable_tracy=true" "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" From a9540de2f6959d5479df087ede7f62bef75b0b6e Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:10:10 -0500 Subject: [PATCH 12/35] Fix doc install steps? --- .github/workflows/docs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b169b8e..7115d5c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,6 +12,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Update apt + run: sudo apt-get -y update + - name: Install Doxygen run: sudo apt-get -y install doxygen From e0e1f20458b24d20c29fb0e200e65d20431118b0 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:10:19 -0500 Subject: [PATCH 13/35] fix mac xmake builds --- .github/workflows/xmake.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 880da96..bdefb55 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -210,7 +210,7 @@ jobs: - name: Configure working-directory: ${{github.workspace}} - run: xmake f -c -y --toolchain=clang-{{matrix.version}} --hyperion_enable_tracy=y + run: xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y - name: Build env: @@ -237,6 +237,6 @@ jobs: run: | xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git" xrepo update-repo -y - xrepo install -y --toolchain=clang-{{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" - xrepo install -y --toolchain=clang-{{matrix.version}} --configs="hyperion_enable_tracy=true" "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" + xrepo install -y --toolchain=clang-${{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" + xrepo install -y --toolchain=clang-${{matrix.version}} --configs="hyperion_enable_tracy=true" "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" From 13d0cacc2b5bd9953d46c9c64660f37fa411555a Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:19:28 -0500 Subject: [PATCH 14/35] Fix xmake mac build? --- .github/workflows/xmake.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index bdefb55..1561cfa 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -203,14 +203,13 @@ jobs: - name: Install LLVM run: | brew install llvm@${{matrix.version}} - echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$PATH" >> $GITHUB_ENV - echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV - echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV - echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV - name: Configure working-directory: ${{github.workspace}} - run: xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y + run: | + echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$PATH" >> $GITHUB_ENV + echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV + xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y - name: Build env: @@ -235,6 +234,8 @@ jobs: env: ACTIONS_STEP_DEBUG: true run: | + echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$PATH" >> $GITHUB_ENV + echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git" xrepo update-repo -y xrepo install -y --toolchain=clang-${{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" From 78df01d913977c1060e3dcb28ff78b767571cb33 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:23:52 -0500 Subject: [PATCH 15/35] Fix mac build? --- .github/workflows/cmake.yml | 2 +- .github/workflows/xmake.yml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index fc2139e..86dd106 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -151,7 +151,7 @@ jobs: - name: Install LLVM run: | brew install llvm@${{matrix.version}} - echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$PATH" >> $GITHUB_ENV + echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$($PATH)" >> $GITHUB_ENV echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 1561cfa..24bc95a 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -207,7 +207,9 @@ jobs: - name: Configure working-directory: ${{github.workspace}} run: | - echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$PATH" >> $GITHUB_ENV + echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$($PATH)" >> $GITHUB_ENV + echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV + echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y @@ -234,7 +236,9 @@ jobs: env: ACTIONS_STEP_DEBUG: true run: | - echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$PATH" >> $GITHUB_ENV + echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$($PATH)" >> $GITHUB_ENV + echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV + echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git" xrepo update-repo -y From b1041fc1f9b7621187aa7972168a253bfcd37249 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:28:16 -0500 Subject: [PATCH 16/35] Fix mac build? --- .github/workflows/cmake.yml | 2 +- .github/workflows/xmake.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 86dd106..2575e24 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -151,7 +151,7 @@ jobs: - name: Install LLVM run: | brew install llvm@${{matrix.version}} - echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$($PATH)" >> $GITHUB_ENV + echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 24bc95a..ebbb80f 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -207,7 +207,7 @@ jobs: - name: Configure working-directory: ${{github.workspace}} run: | - echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$($PATH)" >> $GITHUB_ENV + echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV @@ -236,7 +236,7 @@ jobs: env: ACTIONS_STEP_DEBUG: true run: | - echo "PATH=$(brew --prefix llvm@${{matrix.version}})/bin:$($PATH)" >> $GITHUB_ENV + echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV From 6526f26b74a5206983e96f64e7f0f50e9e7f38d9 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:44:23 -0500 Subject: [PATCH 17/35] Fix mac xmake build? --- .github/workflows/xmake.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index ebbb80f..66dfd96 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -206,11 +206,12 @@ jobs: - name: Configure working-directory: ${{github.workspace}} + env: + CC: $(brew --prefix llvm@${{matrix.version}})/bin/clang + CXX: $(brew --prefix llvm@${{matrix.version}})/bin/clang++ + LDFLAGS: '-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++' run: | echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH - echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV - echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV - echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y - name: Build @@ -235,11 +236,11 @@ jobs: - name: Install Package env: ACTIONS_STEP_DEBUG: true + CC: $(brew --prefix llvm@${{matrix.version}})/bin/clang + CXX: $(brew --prefix llvm@${{matrix.version}})/bin/clang++ + LDFLAGS: '-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++' run: | echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH - echo "CC=$(brew --prefix llvm@${{matrix.version}})/bin/clang" >> $GITHUB_ENV - echo "CXX=$(brew --prefix llvm@${{matrix.version}})/bin/clang++" >> $GITHUB_ENV - echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git" xrepo update-repo -y xrepo install -y --toolchain=clang-${{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" From 27a21521514d37ddb7d0b97f88e018477aa8fd5c Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:53:35 -0500 Subject: [PATCH 18/35] Fix xmake mac build? --- .github/workflows/xmake.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 66dfd96..9a05f3c 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -206,13 +206,9 @@ jobs: - name: Configure working-directory: ${{github.workspace}} - env: - CC: $(brew --prefix llvm@${{matrix.version}})/bin/clang - CXX: $(brew --prefix llvm@${{matrix.version}})/bin/clang++ - LDFLAGS: '-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++' run: | echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH - xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y + xmake f -c -y --toolchain=llvm-${{matrix.version}} --hyperion_enable_tracy=y - name: Build env: @@ -236,13 +232,10 @@ jobs: - name: Install Package env: ACTIONS_STEP_DEBUG: true - CC: $(brew --prefix llvm@${{matrix.version}})/bin/clang - CXX: $(brew --prefix llvm@${{matrix.version}})/bin/clang++ - LDFLAGS: '-L$(brew --prefix llvm@${{matrix.version}})/lib/c++ -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++' run: | echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git" xrepo update-repo -y - xrepo install -y --toolchain=clang-${{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" - xrepo install -y --toolchain=clang-${{matrix.version}} --configs="hyperion_enable_tracy=true" "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" + xrepo install -y --toolchain=llvm-${{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" + xrepo install -y --toolchain=llvm-${{matrix.version}} --configs="hyperion_enable_tracy=true" "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" From faa38afef218ae39eeced9d86ad89b373187ba11 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 20:56:54 -0500 Subject: [PATCH 19/35] debug xmake mac toolchains --- .github/workflows/xmake.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 9a05f3c..98f3658 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -208,6 +208,7 @@ jobs: working-directory: ${{github.workspace}} run: | echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH + xmake show -l toolchains xmake f -c -y --toolchain=llvm-${{matrix.version}} --hyperion_enable_tracy=y - name: Build From 40790522e0d3106611a494dd8c3ecfd1151c0969 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:00:35 -0500 Subject: [PATCH 20/35] debug xmake mac --- .github/workflows/xmake.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 98f3658..da07722 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -203,13 +203,13 @@ jobs: - name: Install LLVM run: | brew install llvm@${{matrix.version}} + echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH - name: Configure working-directory: ${{github.workspace}} run: | - echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH xmake show -l toolchains - xmake f -c -y --toolchain=llvm-${{matrix.version}} --hyperion_enable_tracy=y + xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y - name: Build env: @@ -234,9 +234,8 @@ jobs: env: ACTIONS_STEP_DEBUG: true run: | - echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git" xrepo update-repo -y - xrepo install -y --toolchain=llvm-${{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" - xrepo install -y --toolchain=llvm-${{matrix.version}} --configs="hyperion_enable_tracy=true" "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" + xrepo install -y --toolchain=clang-${{matrix.version}} "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" + xrepo install -y --toolchain=clang-${{matrix.version}} --configs="hyperion_enable_tracy=true" "hyperion_platform ${{ steps.extract_branch.outputs.branch }}" From b67c94080d6201ff31407cfe1cd3ede2c9107db4 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:04:35 -0500 Subject: [PATCH 21/35] debug xmake mac --- .github/workflows/xmake.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index da07722..bddbffb 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -203,6 +203,8 @@ jobs: - name: Install LLVM run: | brew install llvm@${{matrix.version}} + echo "$(brew --prefix llvm@${{matrix.version}})/bin" + ls "$(brew --prefix llvm@${{matrix.version}})/bin" echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH - name: Configure From 9e209e5f5224ab0aef9ff3e20eb3f22a9dc9ec4d Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:12:43 -0500 Subject: [PATCH 22/35] debug xmake mac build --- .github/workflows/xmake.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index bddbffb..e7eca42 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -204,6 +204,7 @@ jobs: run: | brew install llvm@${{matrix.version}} echo "$(brew --prefix llvm@${{matrix.version}})/bin" + ln -s "$(brew --prefix llvm@${{matrix.version}})/bin/clang++" "$(brew --prefix llvm@${{matrix.version}})/bin/clang++-${{matrix.version}}" ls "$(brew --prefix llvm@${{matrix.version}})/bin" echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH From 9a7b1ebe9fff9ef7323d92ee86e01da5195b43c3 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:21:22 -0500 Subject: [PATCH 23/35] Fix warning on clang 19 and 20 --- src/test_main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test_main.cpp b/src/test_main.cpp index 4bcaadc..9214eba 100644 --- a/src/test_main.cpp +++ b/src/test_main.cpp @@ -1,8 +1,8 @@ /// @file test_main.cpp /// @author Braxton Salyer /// @brief Unit tests main for hyperion::platform. -/// @version 0.1 -/// @date 2024-09-22 +/// @version 0.1.1 +/// @date 2025-07-09 /// /// MIT License /// @copyright Copyright (c) 2024 Braxton Salyer @@ -25,6 +25,7 @@ /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE /// SOFTWARE. +#include #include #include From 5ec44ffcc74c1d0b1d633d4dda699b1aab610c7c Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:21:37 -0500 Subject: [PATCH 24/35] debug xmake mac build on clang 19 and 20 --- .github/workflows/xmake.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index e7eca42..2141214 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -207,6 +207,8 @@ jobs: ln -s "$(brew --prefix llvm@${{matrix.version}})/bin/clang++" "$(brew --prefix llvm@${{matrix.version}})/bin/clang++-${{matrix.version}}" ls "$(brew --prefix llvm@${{matrix.version}})/bin" echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH + echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV + echo "CPPFLAGS=-I$(brew --prefix llvm@{{matrix.version}})/include" - name: Configure working-directory: ${{github.workspace}} From d41f434a770c2575b8bde0343e47dd97326ad335 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:32:22 -0500 Subject: [PATCH 25/35] debug xmake mac clang 19, 20 --- .github/workflows/xmake.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 2141214..3cd6522 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -207,14 +207,13 @@ jobs: ln -s "$(brew --prefix llvm@${{matrix.version}})/bin/clang++" "$(brew --prefix llvm@${{matrix.version}})/bin/clang++-${{matrix.version}}" ls "$(brew --prefix llvm@${{matrix.version}})/bin" echo "$(brew --prefix llvm@${{matrix.version}})/bin" >> $GITHUB_PATH - echo "LDFLAGS='-L$(brew --prefix llvm@${{matrix.version}})/lib -Wl,-rpath,$(brew --prefix llvm@${{matrix.version}})/lib/c++'" >> $GITHUB_ENV - echo "CPPFLAGS=-I$(brew --prefix llvm@{{matrix.version}})/include" - name: Configure working-directory: ${{github.workspace}} run: | xmake show -l toolchains xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y + xmake project -k compile_commands - name: Build env: From b4008086ed03da8ebb3c9152d339c488b48f117c Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:41:05 -0500 Subject: [PATCH 26/35] debug xmake mac build --- xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake.lua b/xmake.lua index 1f1088f..60459f1 100644 --- a/xmake.lua +++ b/xmake.lua @@ -2,7 +2,7 @@ set_project("hyperion_platform") set_version("0.5.3") -set_xmakever("2.8.7") +set_xmakever("3.0.0") set_languages("cxx20") From 2a565930c66548b4fb110f6a8a3f81f1d961800e Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:47:18 -0500 Subject: [PATCH 27/35] debug xmake mac build --- .github/workflows/xmake.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 3cd6522..67bed05 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -214,6 +214,7 @@ jobs: xmake show -l toolchains xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y xmake project -k compile_commands + cat compile_commands.json - name: Build env: From 2d5a97d3c2007af937bb4b5c9081d28c9d3e975b Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 21:52:52 -0500 Subject: [PATCH 28/35] Debug xmake mac build --- xmake.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/xmake.lua b/xmake.lua index 60459f1..9395a66 100644 --- a/xmake.lua +++ b/xmake.lua @@ -17,7 +17,6 @@ end) if has_config("hyperion_enable_tracy") then add_requires("tracy", { system = false, - external = true, configs = { languages = "cxx20" } @@ -26,7 +25,6 @@ end add_requires("fast_float", { system = false, - external = true, configs = { languages = "cxx20", }, @@ -34,7 +32,6 @@ add_requires("fast_float", { add_requires("boost_ut", { system = false, - external = true, configs = { modules = false, languages = "cxx20", From 4e08f12da6786773c0a771bc3acee92498c31031 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 22:06:15 -0500 Subject: [PATCH 29/35] debug macos xmake build --- xmake.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/xmake.lua b/xmake.lua index 9395a66..50e38a8 100644 --- a/xmake.lua +++ b/xmake.lua @@ -16,7 +16,6 @@ end) if has_config("hyperion_enable_tracy") then add_requires("tracy", { - system = false, configs = { languages = "cxx20" } @@ -24,14 +23,12 @@ if has_config("hyperion_enable_tracy") then end add_requires("fast_float", { - system = false, configs = { languages = "cxx20", }, }) add_requires("boost_ut", { - system = false, configs = { modules = false, languages = "cxx20", From 14e2c59126d2ef395366c09a6266726914923d61 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 22:12:34 -0500 Subject: [PATCH 30/35] debug xmake mac build --- .github/workflows/xmake.yml | 1 + xmake.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 67bed05..48f18d6 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -214,6 +214,7 @@ jobs: xmake show -l toolchains xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y xmake project -k compile_commands + sed -i 's|"-I"|"-isystem"|g' compile_commands.json cat compile_commands.json - name: Build diff --git a/xmake.lua b/xmake.lua index 50e38a8..60459f1 100644 --- a/xmake.lua +++ b/xmake.lua @@ -16,6 +16,8 @@ end) if has_config("hyperion_enable_tracy") then add_requires("tracy", { + system = false, + external = true, configs = { languages = "cxx20" } @@ -23,12 +25,16 @@ if has_config("hyperion_enable_tracy") then end add_requires("fast_float", { + system = false, + external = true, configs = { languages = "cxx20", }, }) add_requires("boost_ut", { + system = false, + external = true, configs = { modules = false, languages = "cxx20", From f4d9be0adfbceca4f7daa1586bac4cf91f7d6e69 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 22:15:57 -0500 Subject: [PATCH 31/35] debug xmake mac build --- .github/workflows/xmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 48f18d6..a6e16f5 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -214,7 +214,7 @@ jobs: xmake show -l toolchains xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y xmake project -k compile_commands - sed -i 's|"-I"|"-isystem"|g' compile_commands.json + sed -i 's|\"-I\"|\"-isystem\"|g' compile_commands.json cat compile_commands.json - name: Build From 76d6ef185510895cfe88d6ca35709513f4b5dbae Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 22:20:05 -0500 Subject: [PATCH 32/35] debug xmake mac build --- .github/workflows/xmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index a6e16f5..eadf6be 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -214,7 +214,7 @@ jobs: xmake show -l toolchains xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y xmake project -k compile_commands - sed -i 's|\"-I\"|\"-isystem\"|g' compile_commands.json + sed -i 's/"-I"/"-isystem"/g' compile_commands.json cat compile_commands.json - name: Build From ec1cbe01abafe1d262089b875616c090068279b5 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 22:28:42 -0500 Subject: [PATCH 33/35] mac/bsd sed is wack --- .github/workflows/xmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index eadf6be..997ee33 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -214,7 +214,7 @@ jobs: xmake show -l toolchains xmake f -c -y --toolchain=clang-${{matrix.version}} --hyperion_enable_tracy=y xmake project -k compile_commands - sed -i 's/"-I"/"-isystem"/g' compile_commands.json + sed -i '' 's/"-I"/"-isystem"/g' compile_commands.json cat compile_commands.json - name: Build From b82e7654390c0b4b837af15415d57cf00937afc8 Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 22:40:16 -0500 Subject: [PATCH 34/35] disable clang-tidy on xmake macos clang19 and clang20 builds clang-tidy was scanning errors within standard library headers with no way to disable this, so disabling it for these builds --- .github/workflows/xmake.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/xmake.yml b/.github/workflows/xmake.yml index 997ee33..89d0708 100644 --- a/.github/workflows/xmake.yml +++ b/.github/workflows/xmake.yml @@ -223,7 +223,12 @@ jobs: working-directory: ${{github.workspace}} run: | xmake b - xmake check clang.tidy + # disable clang-tidy on clang 19 and 20 because it is scanning errors + # within standard library headers + if [[ ${{matrix.version}} != 19 && ${{matrix.version}} != 20 \ + ]]; then + xmake check clang.tidy + fi - name: Test env: From 1a29845c14378f9af8aa7f9862c58eb8b31c5fdc Mon Sep 17 00:00:00 2001 From: Braxton Salyer Date: Wed, 9 Jul 2025 22:40:41 -0500 Subject: [PATCH 35/35] bump version --- CMakeLists.txt | 2 +- xmake.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9564aa3..47eb644 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.20) -project(hyperion_platform LANGUAGES CXX VERSION 0.5.3) +project(hyperion_platform LANGUAGES CXX VERSION 0.5.4) include(CTest) diff --git a/xmake.lua b/xmake.lua index 60459f1..66b658c 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,6 +1,6 @@ ---@diagnostic disable: undefined-global,undefined-field set_project("hyperion_platform") -set_version("0.5.3") +set_version("0.5.4") set_xmakever("3.0.0")