Skip to content

merge conflicts

merge conflicts #1

Workflow file for this run

name: Check Code Formatting 🛠️
on:
workflow_call:
jobs:
clang-format:
runs-on: ubuntu-22.04
steps:
<<<<<<< HEAD

Check failure on line 8 in .github/workflows/check-format.yaml

View workflow run for this annotation

GitHub Actions / .github/workflows/check-format.yaml

Invalid workflow file

You have an error in your yaml syntax on line 8
- uses: actions/checkout@v3
=======
- uses: actions/checkout@v4
>>>>>>> template-repo/master
with:
fetch-depth: 0
- name: clang-format check 🐉
id: clang-format
uses: ./.github/actions/run-clang-format
with:
failCondition: error
cmake-format:
runs-on: ubuntu-22.04
steps:
<<<<<<< HEAD
- uses: actions/checkout@v3
=======
- uses: actions/checkout@v4
>>>>>>> template-repo/master
with:
fetch-depth: 0
- name: cmake-format check 🎛️
id: cmake-format
uses: ./.github/actions/run-cmake-format
with:
failCondition: error