diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 9432396..5448de1 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -4,33 +4,33 @@ on: [push] name: Build jobs: - # format: - # name: Format - # runs-on: ubuntu-22.04 - # steps: - # - name: Check out the code - # uses: actions/checkout@v4 - # - name: Install clang-format - # run: | - # sudo apt-get update - # sudo apt-get -y install clang-format - # - name: Check the code's formatting - # run: clang-format --dry-run src/*.h src/*.cpp 2>&1 | tee fmt.log; [ ! -s fmt.log ] + format: + name: Format + runs-on: ubuntu-22.04 + steps: + - name: Check out the code + uses: actions/checkout@v4 + - name: Install clang-format + run: | + sudo apt-get update + sudo apt-get -y install clang-format + - name: Check the code's formatting + run: clang-format --dry-run src/*.h src/*.cpp 2>&1 | tee fmt.log; [ ! -s fmt.log ] - # lint: - # name: Lint - # runs-on: ubuntu-22.04 - # steps: - # - name: Check out the code - # uses: actions/checkout@v4 - # - name: Install clang-tidy and the toolchain - # run: | - # sudo apt-get update - # sudo apt-get -y install clang-tidy cmake freeglut3-dev libglew-dev libglm-dev - # - name: Set up the build environment - # run: cmake -S . -B cmake-build-debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - # - name: Have clang-tidy lint for errors - # run: clang-tidy -p cmake-build-debug src/*.cpp src/*.h --warnings-as-errors='*' + lint: + name: Lint + runs-on: ubuntu-22.04 + steps: + - name: Check out the code + uses: actions/checkout@v4 + - name: Install clang-tidy and the toolchain + run: | + sudo apt-get update + sudo apt-get -y install clang-tidy cmake freeglut3-dev libglew-dev libglm-dev + - name: Set up the build environment + run: cmake -S . -B cmake-build-debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + - name: Have clang-tidy lint for errors + run: clang-tidy -p cmake-build-debug src/*.cpp src/*.h --warnings-as-errors='*' build: name: Build @@ -41,13 +41,11 @@ jobs: - name: Install the toolchain run: | sudo apt-get update - sudo apt-get -y install clang freeglut3-dev libglew-dev libglm-dev ninja-build - curl -L https://github.com/Kitware/CMake/releases/download/v3.31.6/cmake-3.31.6-linux-aarch64.sh -o cmake-install.sh - /bin/env sh cmake-install.sh --skip-license + sudo apt-get -y install cmake freeglut3-dev libglew-dev libglm-dev - name: Set up the build environment - run: bin/cmake -S . -B cmake-build-debug -G Ninja + run: cmake -S . -B cmake-build-debug - name: Compile the code - run: bin/cmake --build cmake-build-debug + run: cmake --build cmake-build-debug - name: Save executable uses: forgejo/upload-artifact@v4 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f9dca4..bfe05ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.22) project(perlin-shadows) -set(CMAKE_C_COMPILER "/usr/bin/clang") -set(CMAKE_CXX_COMPILER "/usr/bin/clang++") set(CMAKE_CXX_STANDARD 23) include_directories(src)