Improve all script consistency check

spockframework · Apr 28, 2023 · 8f5f426 · 8f5f426
1 parent 9ab7cc4
commit 8f5f426
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/branches-and-prs.main.kts b/.github/workflows/branches-and-prs.main.kts
@@ -67,12 +67,8 @@ workflow(
             action = CheckoutV3()
         )
         run(
-            name = "Regenerate all workflow YAMLs",
-            command = """find .github/workflows -mindepth 1 -maxdepth 1 -name "*.main.kts" -exec sh -c {} \;"""
-        )
-        run(
-            name = "Check if some file is different after regeneration",
-            command = "git diff --exit-code ."
+            name = "Regenerate all workflow YAMLs and check for modifications",
+            command = """find .github/workflows -mindepth 1 -maxdepth 1 -name "*.main.kts" | xargs -ri sh -c '{} && git diff --exit-code'"""
         )
     }
 

diff --git a/.github/workflows/branches-and-prs.yml b/.github/workflows/branches-and-prs.yml
@@ -38,11 +38,8 @@ jobs:
       name: Checkout Repository
       uses: actions/checkout@v3
     - id: step-1
-      name: Regenerate all workflow YAMLs
-      run: find .github/workflows -mindepth 1 -maxdepth 1 -name "*.main.kts" -exec sh -c {} \;
-    - id: step-2
-      name: Check if some file is different after regeneration
-      run: git diff --exit-code .
+      name: Regenerate all workflow YAMLs and check for modifications
+      run: find .github/workflows -mindepth 1 -maxdepth 1 -name "*.main.kts" | xargs -ri sh -c '{} && git diff --exit-code'
   build-and-verify:
     name: Build and Verify
     runs-on: ${{ matrix.os }}