From 5bdc78e7e0c182dfc1edad8fc014517c68e65a75 Mon Sep 17 00:00:00 2001 From: tony-josi-aws Date: Thu, 30 Mar 2023 14:43:48 +0530 Subject: [PATCH 1/5] fix uncrustify run command --- .github/workflows/uncrustify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uncrustify.yml b/.github/workflows/uncrustify.yml index 2e492b8ba6..15a5d9b20b 100644 --- a/.github/workflows/uncrustify.yml +++ b/.github/workflows/uncrustify.yml @@ -34,8 +34,8 @@ jobs: with: repository: ${{ steps.upstreamrepo.outputs.RemoteRepo }} ref: ${{ steps.upstreambranch.outputs.branchname }} - - name: Install Uncrustify - run: apt-get update && apt-get install uncrustify + - name: Install Uncrustify and Git + run: apt-get update && apt-get install uncrustify git-all - name: Run Uncrustify run: | uncrustify --version From f660ab435fa741f8767f8a2849829f02a92ecca6 Mon Sep 17 00:00:00 2001 From: tony-josi-aws Date: Thu, 30 Mar 2023 19:11:04 +0530 Subject: [PATCH 2/5] test uncrustify --- source/FreeRTOS_ARP.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/FreeRTOS_ARP.c b/source/FreeRTOS_ARP.c index 974d42f26b..2ff3189fd7 100644 --- a/source/FreeRTOS_ARP.c +++ b/source/FreeRTOS_ARP.c @@ -317,6 +317,10 @@ eFrameProcessingResult_t eARPProcessPacket( ARPPacket_t * const pxARPFrame ) static void vProcessARPPacketReply( const ARPPacket_t * pxARPFrame, uint32_t ulSenderProtocolAddress ) { + + + + const ARPHeader_t * pxARPHeader = &( pxARPFrame->xARPHeader ); uint32_t ulTargetProtocolAddress = pxARPHeader->ulTargetProtocolAddress; From 6d66bdacde1512bee6b281070340f0a9270a78c2 Mon Sep 17 00:00:00 2001 From: tony-josi-aws Date: Fri, 31 Mar 2023 09:44:31 +0530 Subject: [PATCH 3/5] Revert "test uncrustify" This reverts commit f660ab435fa741f8767f8a2849829f02a92ecca6. --- source/FreeRTOS_ARP.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/FreeRTOS_ARP.c b/source/FreeRTOS_ARP.c index 2ff3189fd7..974d42f26b 100644 --- a/source/FreeRTOS_ARP.c +++ b/source/FreeRTOS_ARP.c @@ -317,10 +317,6 @@ eFrameProcessingResult_t eARPProcessPacket( ARPPacket_t * const pxARPFrame ) static void vProcessARPPacketReply( const ARPPacket_t * pxARPFrame, uint32_t ulSenderProtocolAddress ) { - - - - const ARPHeader_t * pxARPHeader = &( pxARPFrame->xARPHeader ); uint32_t ulTargetProtocolAddress = pxARPHeader->ulTargetProtocolAddress; From b0dd0a9e484c755459f76bdef54ceb9511ea3185 Mon Sep 17 00:00:00 2001 From: tony-josi-aws Date: Mon, 3 Apr 2023 16:24:59 +0530 Subject: [PATCH 4/5] removing apt-get prompt while installing git --- .github/workflows/uncrustify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uncrustify.yml b/.github/workflows/uncrustify.yml index 15a5d9b20b..af09e802a8 100644 --- a/.github/workflows/uncrustify.yml +++ b/.github/workflows/uncrustify.yml @@ -35,7 +35,7 @@ jobs: repository: ${{ steps.upstreamrepo.outputs.RemoteRepo }} ref: ${{ steps.upstreambranch.outputs.branchname }} - name: Install Uncrustify and Git - run: apt-get update && apt-get install uncrustify git-all + run: apt-get update && apt-get --assume-yes install uncrustify git - name: Run Uncrustify run: | uncrustify --version From b1dca05ba121962902f3b5eb96abcde4a9e9a68e Mon Sep 17 00:00:00 2001 From: tony-josi-aws Date: Mon, 3 Apr 2023 18:41:42 +0530 Subject: [PATCH 5/5] removing the deprecated set-output command from uncrustify bot run yml, use latest git --- .github/workflows/uncrustify.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/uncrustify.yml b/.github/workflows/uncrustify.yml index af09e802a8..df02b527da 100644 --- a/.github/workflows/uncrustify.yml +++ b/.github/workflows/uncrustify.yml @@ -15,17 +15,23 @@ jobs: env: GITHUB_CONTEXT: ${{ toJson(github) }} run: echo "$GITHUB_CONTEXT" + - name: Install Git + run: | + apt-get update && apt-get --assume-yes install software-properties-common curl jq sed + add-apt-repository ppa:git-core/ppa + apt-get update && apt-get --assume-yes install git + git --version - name: get pullrequest url run: | echo ${{ github.event.issue.pull_request.url }} - name: get upstream repo id: upstreamrepo run: | - echo "::set-output name=RemoteRepo::$(curl -H "Accept: application/vnd.github.sailor-v-preview+json" --url ${{ github.event.issue.pull_request.url }} | jq '.head.repo.full_name' | sed 's/\"//g')" + echo "RemoteRepo=$(curl -H "Accept: application/vnd.github.sailor-v-preview+json" --url ${{ github.event.issue.pull_request.url }} | jq '.head.repo.full_name' | sed 's/\"//g')" >> $GITHUB_OUTPUT - name: get upstream branch id: upstreambranch run: | - echo "::set-output name=branchname::$(curl -H "Accept: application/vnd.github.sailor-v-preview+json" --url ${{ github.event.issue.pull_request.url }} | jq '.head.ref' | sed 's/\"//g')" + echo "branchname=$(curl -H "Accept: application/vnd.github.sailor-v-preview+json" --url ${{ github.event.issue.pull_request.url }} | jq '.head.ref' | sed 's/\"//g')" >> $GITHUB_OUTPUT - name: echo upstream repo:branch run: | echo ${{ steps.upstreamrepo.outputs.RemoteRepo }}:${{ steps.upstreambranch.outputs.branchname }} @@ -34,14 +40,15 @@ jobs: with: repository: ${{ steps.upstreamrepo.outputs.RemoteRepo }} ref: ${{ steps.upstreambranch.outputs.branchname }} - - name: Install Uncrustify and Git - run: apt-get update && apt-get --assume-yes install uncrustify git + - name: Install Uncrustify + run: apt-get update && apt-get --assume-yes install uncrustify - name: Run Uncrustify run: | uncrustify --version find . -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} + - name: Push changes to upstream repository run: | + git config --global --add safe.directory '*' git config --global user.name 'GitHub Action' git config --global user.email 'action@github.com' git add -A