Skip to content

Commit

Permalink
bring back ci test on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
matcool committed Nov 10, 2024
1 parent f1ee1ee commit af095f8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.yml]
indent_size = 2
11 changes: 9 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,6 +26,13 @@ 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
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -G Ninja

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit af095f8

Please sign in to comment.