From 39dad999aea6f73e2d2192810434a75fc8133d1c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 8 May 2024 16:05:28 +0900 Subject: [PATCH] Added new input param for RHEL build --- .github/workflows/images_build_rhel.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml index 6f84de1e1..1dc5e108a 100644 --- a/.github/workflows/images_build_rhel.yml +++ b/.github/workflows/images_build_rhel.yml @@ -20,6 +20,9 @@ on: required: true default: false type: boolean + trunk_version: + description: 'Specify trunk major version' + type: string defaults: run: @@ -139,6 +142,7 @@ jobs: env: LATEST_BRANCH: ${{ env.LATEST_BRANCH }} github_ref: ${{ github.ref }} + TRUNK_MAJOR_VERSION: ${{ inputs.trunk_version }} run: | result=false sha_short=$(git rev-parse --short HEAD) @@ -156,13 +160,21 @@ jobs: echo "::group::Branch metadata" echo "is_default_branch - $result" echo "current_branch - $github_ref" - echo "secret_prefix=RHEL_${github_ref//.}" + if [ "${github_ref//.}" == "trunk" ] && [ ! -z "$TRUNK_MAJOR_VERSION" ]; then + echo "secret_prefix=RHEL_${TRUNK_MAJOR_VERSION//.}" + else + echo "secret_prefix=RHEL_${github_ref//.}" + fi echo "sha_short - $sha_short" echo "::endgroup::" echo "is_default_branch=$result" >> $GITHUB_OUTPUT echo "current_branch=$github_ref" >> $GITHUB_OUTPUT - echo "secret_prefix=RHEL_${github_ref//.}" >> $GITHUB_OUTPUT + if [ "${github_ref//.}" == "trunk" ] && [ ! -z "$TRUNK_MAJOR_VERSION" ]; then + echo "secret_prefix=RHEL_${TRUNK_MAJOR_VERSION//.}" >> $GITHUB_OUTPUT + else + echo "secret_prefix=RHEL_${github_ref//.}" >> $GITHUB_OUTPUT + fi echo "sha_short=$sha_short" >> $GITHUB_OUTPUT - name: Cleanup existing cache