uncrustify yml fix (#815)

FreeRTOS · Mar 30, 2023 · a3f418a · a3f418a
1 parent a280275
commit a3f418a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,11 +71,12 @@ jobs:
   formatting:
     # Use only 18.04 since we want the uncrustify version to
     # be 0.66.1_f to ensure proper formatting.
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
+    container: ubuntu:18.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Uncrustify
-        run: sudo apt-get install uncrustify
+        run: apt-get update && apt-get install uncrustify
       - name: Run Uncrustify
         run: |
           uncrustify --version

diff --git a/.github/workflows/uncrustify.yml b/.github/workflows/uncrustify.yml
@@ -8,7 +8,8 @@ jobs:
   Uncrustify:
     name: Run_Uncrustify
     if: ${{ github.event.issue.pull_request && github.event.comment.body == '/bot run uncrustify' }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
+    container: ubuntu:18.04
     steps:
       - name: Dump GitHub context
         env:
@@ -29,17 +30,16 @@ jobs:
         run: |
           echo ${{ steps.upstreamrepo.outputs.RemoteRepo }}:${{ steps.upstreambranch.outputs.branchname }}
       - name: Checkout upstream repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
            repository: ${{ steps.upstreamrepo.outputs.RemoteRepo }}
            ref: ${{ steps.upstreambranch.outputs.branchname }}
       - name: Install Uncrustify
-        run: sudo apt-get install uncrustify
+        run: apt-get update && apt-get install uncrustify
       - name: Run Uncrustify
         run: |
           uncrustify --version
           find .  -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} +
-          find .  -iname "*.[hc]" -exec uncrustify -c tools/uncrustify.cfg --no-backup --replace {} +
       - name: Push changes to upstream repository
         run: |
           git config --global user.name 'GitHub Action'