Move conditionals to their correct files

Required-githooks: true #Pragmas from previous commit message: Skip-PR-comments: true Run-GHA: true Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Jul 8, 2024 · 6bf7f9a · 6bf7f9a
1 parent f61d870
commit 6bf7f9a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/rpm-build-and-test.yml b/.github/workflows/rpm-build-and-test.yml
@@ -42,7 +42,7 @@ defaults:
 permissions: {}
 
 jobs:
-  variables:
+  Variables:
     name: Compute outputs
     runs-on: [self-hosted, light]
     outputs:
@@ -60,26 +60,27 @@ jobs:
 
   Call-RPM-Build:
     name: Build RPM
-    needs: variables
+    needs: Variables
+    if: inputs.rpm-test-version == ''
     permissions:
       statuses: write
     uses: ./.github/workflows/rpm-build.yml
     secrets: inherit
     with:
-      NAME: ${{ needs.variables.outputs.NAME }}
-      DISTROS: ${{ needs.variables.outputs.DISTROS }}
-      EL8_BUILD_VERSION: ${{ needs.variables.outputs.EL8_BUILD_VERSION }}
-      EL9_BUILD_VERSION: ${{ needs.variables.outputs.EL9_BUILD_VERSION }}
-      LEAP15_VERSION: ${{ needs.variables.outputs.LEAP15_VERSION }}
-      PACKAGING_DIR: ${{ needs.variables.outputs.PACKAGING_DIR}}
+      NAME: ${{ needs.Variables.outputs.NAME }}
+      DISTROS: ${{ needs.Variables.outputs.DISTROS }}
+      EL8_BUILD_VERSION: ${{ needs.Variables.outputs.EL8_BUILD_VERSION }}
+      EL9_BUILD_VERSION: ${{ needs.Variables.outputs.EL9_BUILD_VERSION }}
+      LEAP15_VERSION: ${{ needs.Variables.outputs.LEAP15_VERSION }}
+      PACKAGING_DIR: ${{ needs.Variables.outputs.PACKAGING_DIR}}
 
   Call-RPM-Test:
     # TODO: investigate how cancelling this can cancel the downstream job
     name: Test RPMs with DAOS
-    needs: [variables, Call-RPM-Build]
+    needs: [Variables, Call-RPM-Build]
     uses: ./.github/workflows/rpm-test.yml
     secrets: inherit
     with:
-      NAME: ${{ needs.variables.outputs.NAME }}
-      DISTROS: ${{ needs.variables.outputs.DISTROS }}
-      TEST_TAG: ${{ needs.variables.outputs.TEST_TAG }}
+      NAME: ${{ needs.Variables.outputs.NAME }}
+      DISTROS: ${{ needs.Variables.outputs.DISTROS }}
+      TEST_TAG: ${{ needs.Variables.outputs.TEST_TAG }}
diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml
@@ -153,8 +153,7 @@ jobs:
     name: Calculate RPM Build Matrix
     runs-on: [self-hosted, wolf]
     needs: [Import-commit-pragmas, Create-symlinks, Import-commit-message]
-    if: inputs.rpm-test-version == '' &&
-        needs.Import-commit-pragmas.outputs.skip-build != 'true'
+    if: needs.Import-commit-pragmas.outputs.skip-build != 'true'
     outputs:
       distros: ${{ steps.distros.outputs.text }}
       matrix: ${{ steps.matrix.outputs.text }}