From f31e3d04f02c673cb739f03880f86f9b26bf7ca0 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 24 Apr 2024 15:58:59 -0400 Subject: [PATCH] Pass through LEAP15_VERSION Skip-PR-comments: true Run-GHA: true Required-githooks: true Signed-off-by: Brian J. Murrell --- .github/workflows/rpm-build-and-test.yml | 2 ++ .github/workflows/rpm-build.yml | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rpm-build-and-test.yml b/.github/workflows/rpm-build-and-test.yml index bbc568e..e4c9d96 100644 --- a/.github/workflows/rpm-build-and-test.yml +++ b/.github/workflows/rpm-build-and-test.yml @@ -50,6 +50,7 @@ jobs: 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 }} steps: - name: Echo @@ -67,6 +68,7 @@ jobs: 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}} Test-with-DAOS: diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml index f79d169..187b49a 100644 --- a/.github/workflows/rpm-build.yml +++ b/.github/workflows/rpm-build.yml @@ -15,6 +15,9 @@ on: EL9_BUILD_VERSION: type: string required: true + LEAP15_VERSION: + type: string + required: true PACKAGING_DIR: type: string required: true @@ -260,10 +263,10 @@ jobs: 'leap15') CHROOT_NAME='opensuse-leap-${{ env.CP_LEAP15_VERSION && env.CP_LEAP15_VERSION || - env.LEAP15_VERSION }}-x86_64' + inputs.LEAP15_VERSION }}-x86_64' DISTRO_NAME="Leap" DISTRO_VERSION='${{ env.CP_LEAP15_VERSION && - env.CP_LEAP15_VERSION || env.LEAP15_VERSION }}' + env.CP_LEAP15_VERSION || inputs.LEAP15_VERSION }}' ;; esac echo "CHROOT_NAME=$CHROOT_NAME" >> $GITHUB_ENV