updates

Required-githooks: true this-is-Signed-off-by: Brian J. Murrell <[email protected]> Run-GHA: true Skip-PR-comments: true
daos-stack · Oct 28, 2024 · 6033602 · 6033602
1 parent 343974f
commit 6033602
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.github/actions/variables-from-env/action.yml b/.github/actions/variables-from-env/action.yml
@@ -1,5 +1,14 @@
 name: 'Create Variables from Env Variables'
 description: 'Variables from Env Variables'
+outputs:
+  NAME: ${{ env.NAME }}
+  DISTROS: ${{ env.DISTROS }}
+  EL8_BUILD_VERSION: ${{ env.EL8_BUILD_VERSION }}
+  EL9_BUILD_VERSION: ${{ env.EL9_BUILD_VERSION }}
+  LEAP15_VERSION: ${{ env.LEAP15_VERSION }}
+  PACKAGING_DIR: ${{ env.PACKAGING_DIR }}
+  COVFN_DISABLED: ${{ env.COVFN_DISABLED }}
+  TEST_TAG: ${{ env.TEST_TAG }}
 runs:
   using: "composite"
   # What a dumb jobs this is
@@ -8,16 +17,6 @@ runs:
   # with:
   #    NAME: ${{ env.DISTROS }}
   # in the Call-RPM-Build job but the above issue prevents it
-  name: Compute outputs
-  outputs:
-    NAME: ${{ env.NAME }}
-    DISTROS: ${{ env.DISTROS }}
-    EL8_BUILD_VERSION: ${{ env.EL8_BUILD_VERSION }}
-    EL9_BUILD_VERSION: ${{ env.EL9_BUILD_VERSION }}
-    LEAP15_VERSION: ${{ env.LEAP15_VERSION }}
-    PACKAGING_DIR: ${{ env.PACKAGING_DIR }}
-    COVFN_DISABLED: ${{ env.COVFN_DISABLED }}
-    TEST_TAG: ${{ env.TEST_TAG }}
   steps:
     - name: Make outputs from env variables
       run: |

diff --git a/.github/workflows/rpm-build-and-test.yml b/.github/workflows/rpm-build-and-test.yml
@@ -63,9 +63,12 @@ jobs:
     # with:
     #    NAME: ${{ env.DISTROS }}
     # in the Call-RPM-Build job but the above issue prevents it
-    name: Compute outputs
     runs-on: [self-hosted, light]
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Compute outputs
         uses: ./.github/actions/variables-from-env