From d48a738739fa15626a9da5a2c27ca2b3b1151198 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 | 8 ++++++-- CMakeLists.txt | 2 +- 3 files changed, 10 insertions(+), 3 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..68b6dd4 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,6 +26,10 @@ jobs: # - run: sudo apt install ninja-build - uses: seanmiddleditch/gha-setup-ninja@v4 + - name: Install GCC 12 + if: matrix.config.os == 'ubuntu-latest' + run: sudo apt install -y gcc-12 g++-12 + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -G Ninja 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)