From 0904c13b3f14c64ea1c38cdcd768a64d7cb9ba18 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 29 Nov 2023 20:30:44 +0100 Subject: [PATCH] Add merge_conflict_job (#3) --- .github/workflows/check.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 7d95ba2..972cfdc 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -54,3 +54,13 @@ jobs: ank run workload trailer_connected_provider --runtime podman --config $'image: sdvblueprint.azurecr.io/sdvblueprint/in-vehicle-stack/trailer_connected_provider:0.1.0\ncommandOptions: ["--network", "host", "--name", "trailer_connected_provider"]' --agent agent_A - run: ank get workloads - run: cat /tmp/logs/*.log + merge_conflict_job: + # This ensures that no git merge conflict markers (<<<, ...) are contained + name: Find merge conflicts + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + show-progress: 'false' + - name: Merge Conflict finder + uses: olivernybroe/action-conflict-finder@v4.0