Skip to content

Commit

Permalink
chore: resolve fmt dependendency using fetchcontent (#72)
Browse files Browse the repository at this point in the history
* get rid of cmake presets
* update ci to use clang-15 as ubuntu broke clang-14 with libc++ updates
* HACK: use set target properties to disable analyzers on external deps
  • Loading branch information
hrzlgnm authored Nov 9, 2023
1 parent 2894e2c commit db92805
Show file tree
Hide file tree
Showing 8 changed files with 146 additions and 218 deletions.
187 changes: 102 additions & 85 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,91 +1,108 @@
name: Continuous Integration

on:
push:
branches:
- master
push:
branches:
- master

pull_request:
branches:
- master
pull_request:
branches:
- master

jobs:
lint:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v4
with: { python-version: '3.8' }

- name: Install codespell
run: pip3 install codespell

- name: Lint
run: cmake -D FORMAT_COMMAND=clang-format-14 -P cmake/lint.cmake

- name: Spell check
if: always()
run: cmake -P cmake/spell.cmake
sanitize:
needs: [lint]

runs-on: ubuntu-22.04

env: { CXX: clang++-14 }

steps:
- uses: actions/checkout@v3

- name: Install Deps
run: sudo apt-get update -q
&& sudo apt-get install ninja-build libfmt-dev -q -y

- name: Configure
run: cmake --preset=ci-sanitize -GNinja

- name: Build
run: cmake --build build/sanitize -j 2

- name: Test
env:
ASAN_OPTIONS: "strict_string_checks=1:\
detect_stack_use_after_return=1:\
check_initialization_order=1:\
strict_init_order=1:\
detect_leaks=1"
UBSAN_OPTIONS: print_stacktrace=1
working-directory: build/sanitize
run: ctest --output-on-failure --no-tests=error
test:
needs: [lint]

strategy:
matrix:
os: [ubuntu-22.04]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3

- name: Install static analyzers and dependencies
if: matrix.os == 'ubuntu-22.04'
run: >-
sudo apt-get update -q
sudo apt-get install clang-tidy-14 cppcheck ninja-build libfmt-dev -y -q
sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 140
- name: Configure
shell: pwsh
run: cmake "--preset=ci-$("${{ matrix.os }}".split("-")[0])" -GNinja

- name: Build
run: cmake --build build --config Release -j 2

- name: Test
working-directory: build
run: ctest --output-on-failure --no-tests=error -j 2
lint:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v4
with: { python-version: "3.8" }

- name: Install codespell
run: pip3 install codespell

- name: Lint
run: cmake -D FORMAT_COMMAND=clang-format-14 -P cmake/lint.cmake

- name: Spell check
if: always()
run: cmake -P cmake/spell.cmake
sanitize:
needs: [lint]

runs-on: ubuntu-22.04

env: { CXX: clang++-15 }

steps:
- uses: actions/checkout@v3

- name: Install Deps
run: |
sudo apt-get update -q
sudo apt-get install ninja-build clang-15 -q -y
- name: Configure
run: >-
cmake
-DCMAKE_BUILD_TYPE=Sanitize
-DCMAKE_CXX_FLAGS_SANITIZE="-O2 -g -fsanitize=address,undefined -fno-omit-frame-pointer -fno-common"
-GNinja -S .
-B ../build/sanitize
- name: Build
run: cmake --build ../build/sanitize -j 2

- name: Test
env:
ASAN_OPTIONS: "strict_string_checks=1:\
detect_stack_use_after_return=1:\
check_initialization_order=1:\
strict_init_order=1:\
detect_leaks=1"
UBSAN_OPTIONS: print_stacktrace=1
working-directory: ../build/sanitize
run: ctest --output-on-failure --no-tests=error
test:
needs: [lint]

strategy:
matrix:
os: [ubuntu-22.04]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3

- name: Install static analyzers and dependencies
if: matrix.os == 'ubuntu-22.04'
run: |
sudo apt-get update -q
sudo apt-get install clang-tidy-15 cppcheck ninja-build -y -q
sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 150
- name: Configure
run: >-
cmake
-GNinja
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS="-fstack-protector-strong -fcf-protection=full -fstack-clash-protection -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow=compatible-local -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wimplicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast"
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now"
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now"
-DCMAKE_CXX_CLANG_TIDY="clang-tidy;--header-filter=^/home/runner/work/monkey/monkey"
-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-DCMAKE_CXX_CPPCHECK="cppcheck;--inline-suppr;--library=/home/runner/work/monkey/monkey/cppcheck/monkey.cfg"
-DCMAKE_CXX_EXTENSIONS=OFF
-DCMAKE_CXX_STANDARD=20
-DCMAKE_CXX_STANDARD_REQUIRED=ON
-S .
-B ../build/Release
- name: Build
run: cmake --build ../build/Release -j 2

- name: Test
working-directory: ../build/Release
run: ctest --output-on-failure --no-tests=error -j 2
11 changes: 6 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ project(
HOMEPAGE_URL "https://github.com/hrzlgnm/monkey"
LANGUAGES CXX)

find_package(fmt REQUIRED)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/fmt.cmake)

# ---- Declare library ----
add_library(
Expand Down Expand Up @@ -70,11 +74,8 @@ target_link_libraries(monkey_lib PRIVATE fmt::fmt doctest::doctest doctest::dll)
add_executable(monkey_exe source/main.cpp)
add_executable(monkey::exe ALIAS monkey_exe)
target_compile_definitions(monkey_exe PRIVATE DOCTEST_CONFIG_DISABLE)

set_property(TARGET monkey_exe PROPERTY OUTPUT_NAME monkey)

target_compile_features(monkey_exe PRIVATE cxx_std_20)

target_link_libraries(monkey_exe PRIVATE monkey_lib)
target_link_libraries(monkey_exe PRIVATE fmt::fmt monkey_lib)

include(cmake/dev-mode.cmake)
122 changes: 0 additions & 122 deletions CMakePresets.json

This file was deleted.

14 changes: 14 additions & 0 deletions cmake/fmt.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
include(FetchContent)

FetchContent_Declare(fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
GIT_TAG 8.1.1
)

FetchContent_MakeAvailable(fmt)

# HACK(hrzgnm): disable analyzer checks on fmt library
set_target_properties(fmt PROPERTIES
CXX_CLANG_TIDY ""
CXX_CPPCHECK "")

8 changes: 8 additions & 0 deletions cppcheck/monkey.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<def format="2">
<define name="TEST_CASE(...)" value=""/>
<define name="TEST_SUITE(...)" value=""/>
<define name="TEST_SUITE_BEGIN(...)" value=""/>
<define name="TEST_SUITE_END()" value=""/>
<define name="SUBCASE(...)" value=""/>
</def>
2 changes: 2 additions & 0 deletions source/compiler/symbol_table.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <string>
#include <vector>

#include <fmt/ostream.h>

template<typename Value>
using string_map = std::map<std::string, Value, std::less<>>;

Expand Down
2 changes: 1 addition & 1 deletion source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ auto monkey_business()
auto print_parse_errors(const std::vector<std::string>& errors)
{
monkey_business();
std::cerr << " parser errorrs: \n";
std::cerr << " parser errors: \n";
for (const auto& error : errors) {
std::cerr << "\t" << error << "\n";
}
Expand Down
Loading

0 comments on commit db92805

Please sign in to comment.