[AUTO-CHERRYPICK] Fixing RPM macros check. - branch 3.0-dev (#11797)

Co-authored-by: Pawel Winogrodzki <[email protected]>
microsoft · Jan 7, 2025 · 2e7669c · 2e7669c
1 parent 2f3f2f9
commit 2e7669c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/check-manifests.yml b/.github/workflows/check-manifests.yml
@@ -21,7 +21,9 @@ jobs:
     # This PR runner uses an older Ubuntu with rpm version 4.17, which doesn't understand some newer macros like %bcond
     - name: Define missing rpm macros
       run: |
-        [[ -n $(rpm --eval '%bcond test 1') ]] && echo '%bcond() %[ (%{2}) ? "%{expand:%%bcond_without %{1}}" : "%{expand:%%bcond_with %{1}}" ]' > ~/.rpmmacros
+        if [[ -n $(rpm --eval '%bcond test 1') ]]; then
+          echo '%bcond() %[ (%{2}) ? "%{expand:%%bcond_without %{1}}" : "%{expand:%%bcond_with %{1}}" ]' > ~/.rpmmacros
+        fi
 
     - name: Check x86_64 manifests
       run: |

diff --git a/.github/workflows/check-package-cgmanifest.yml b/.github/workflows/check-package-cgmanifest.yml
@@ -22,7 +22,9 @@ jobs:
     # This PR runner uses an older Ubuntu with rpm version 4.17, which doesn't understand some newer macros like %bcond
     - name: Define missing rpm macros
       run: |
-        [[ -n $(rpm --eval '%bcond test 1') ]] && echo '%bcond() %[ (%{2}) ? "%{expand:%%bcond_without %{1}}" : "%{expand:%%bcond_with %{1}}" ]' > ~/.rpmmacros
+        if [[ -n $(rpm --eval '%bcond test 1') ]]; then
+          echo '%bcond() %[ (%{2}) ? "%{expand:%%bcond_without %{1}}" : "%{expand:%%bcond_with %{1}}" ]' > ~/.rpmmacros
+        fi
 
     - name: Get base commit for PRs
       if: ${{ github.event_name == 'pull_request' }}