From a1658a5984eac64b2c72deb766a46fecb6b439d8 Mon Sep 17 00:00:00 2001
From: Stoyan Zoubev <Stoyan.Zoubev@bosch.io>
Date: Wed, 26 Jul 2023 16:40:29 +0300
Subject: [PATCH] Yocto recipe for Kanto Update Manager (kirkstone branch)
 (#62)

[#60] Yocto recipe for Kanto Update Manager

Signed-off-by: Stoyan Zoubev <Stoyan.Zoubev@bosch.io>
---
 .github/workflows/validation.yml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index bbf7f99..eb57ba0 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -35,20 +35,12 @@ jobs:
       - name: Get branch name (merge)
         if: github.event_name != 'pull_request'
         shell: bash
-<<<<<<< HEAD
-        run: if [ ${GITHUB_REF#refs/heads/} == "main" ]; then echo "BRANCH_NAME=$(echo "scarthgap")" >>$GITHUB_ENV; else echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" >>$GITHUB_ENV; fi
-=======
         run: if [ ${GITHUB_REF#refs/heads/} == "main" ]; then echo "BRANCH_NAME=$(echo "mickledore")" >>$GITHUB_ENV; else echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" >>$GITHUB_ENV; fi
->>>>>>> 4ae27ac (Add validation workflow and fix container management revision (#57))
         id: get_branch
       - name: Get branch name (pull request)
         if: github.event_name == 'pull_request'
         shell: bash
-<<<<<<< HEAD
-        run: if [ ${{ github.event.pull_request.base.ref }} == "main" ]; then echo "BRANCH_NAME=$(echo "scarthgap")" >>$GITHUB_ENV; else echo "BRANCH_NAME=$(echo ${{ github.event.pull_request.base.ref }})" >>$GITHUB_ENV; fi
-=======
         run: if [ ${{ github.event.pull_request.base.ref }} == "main" ]; then echo "BRANCH_NAME=$(echo "mickledore")" >>$GITHUB_ENV; else echo "BRANCH_NAME=$(echo ${{ github.event.pull_request.base.ref }})" >>$GITHUB_ENV; fi
->>>>>>> 4ae27ac (Add validation workflow and fix container management revision (#57))
         id: get_branch_pr
       - name: Checkout
         uses: actions/checkout@v2
@@ -105,13 +97,10 @@ jobs:
         run: |
           source poky/oe-init-build-env build
           bitbake software-update
-<<<<<<< HEAD
       - name: Build update manager
         run: |
           source poky/oe-init-build-env build
           bitbake update-manager
-=======
->>>>>>> 4ae27ac (Add validation workflow and fix container management revision (#57))
       - name: Build system metrics
         run: |
           source poky/oe-init-build-env build
@@ -123,4 +112,4 @@ jobs:
       - name: Free space info
         run: |
           echo "Free space:"
-          df -h
+          df -h
\ No newline at end of file