From 5fa1f8b73337f5631e0b9474d020f002b4b6abdc Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:27:18 -0300 Subject: [PATCH] bring back ci test on linux --- .editorconfig | 3 +++ .github/workflows/build.yml | 12 +++++++++--- CMakeLists.txt | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index c1e2c64..ce873b1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,6 @@ end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true + +[*.yml] +indent_size = 2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 321d995..9fc335a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,8 @@ jobs: fail-fast: false matrix: config: - # - name: Ubuntu - # os: ubuntu-latest + - name: Ubuntu + os: ubuntu-latest - name: macOS os: macos-latest @@ -26,8 +26,14 @@ jobs: # - run: sudo apt install ninja-build - uses: seanmiddleditch/gha-setup-ninja@v4 + - name: Install LLVM and Clang + if: matrix.config.os == 'ubuntu-latest' + uses: KyleMayes/install-llvm-action@v2 + with: + version: "18.1.8" + - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -G Ninja + run: CMAKE_CXX_COMPILER=clang cmake -B ${{github.workspace}}/build -G Ninja - name: Build run: cmake --build ${{github.workspace}}/build --parallel diff --git a/CMakeLists.txt b/CMakeLists.txt index a017132..63ef73f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if (NOT COMMAND CPMAddPackage) include(cmake/get_cpm.cmake) endif() -CPMAddPackage("gh:geode-sdk/result@1.1.0") +CPMAddPackage("gh:geode-sdk/result@1.1.1") # This option is only useful for Geode itself if (DEFINED MAT_JSON_AS_INTERFACE AND MAT_JSON_AS_INTERFACE)