From be8e4f6159c051a7c34c74116b201012ad756a4d Mon Sep 17 00:00:00 2001 From: yasserfaraazkhan Date: Thu, 8 Feb 2024 15:37:40 +0530 Subject: [PATCH] test branch name --- .github/workflows/e2e-functional.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-functional.yml b/.github/workflows/e2e-functional.yml index a2fe55fd..4271cae3 100644 --- a/.github/workflows/e2e-functional.yml +++ b/.github/workflows/e2e-functional.yml @@ -93,7 +93,6 @@ jobs: - name: Set Environment Variables run: | - echo "BRANCH = ${{ env.BRANCH }}" if [ "${{ github.event_name }}" == "pull_request" ]; then echo "BUILD_SUFFIX=desktop-pr" >> $GITHUB_ENV echo "TYPE=PR" >> $GITHUB_ENV @@ -103,13 +102,13 @@ jobs: echo "TYPE=RELEASE" >> $GITHUB_ENV echo "ZEPHYR_ENABLE=true" >> $GITHUB_ENV - elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then + elif [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ "${{ inputs.tag }}" == "" ]; then echo "BUILD_SUFFIX=desktop-manual-trigger" >> $GITHUB_ENV echo "TYPE=MANUAL" >> $GITHUB_ENV elif [ "${{ github.event_name }}" == "push" ] && [ "${{ github.ref }}" == "refs/heads/post-zephry-link-channel" ]; then - echo "TYPE=MASTER" >> $GITHUB_ENV echo "BUILD_SUFFIX=desktop-master-push" >> $GITHUB_ENV + echo "TYPE=MASTER" >> $GITHUB_ENV echo "ZEPHYR_ENABLE=true" >> $GITHUB_ENV elif [ "${{ inputs.tag }}" != "" ]; then @@ -188,13 +187,13 @@ jobs: echo "TYPE=RELEASE" >> $GITHUB_ENV echo "ZEPHYR_ENABLE=true" >> $GITHUB_ENV - elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then + elif [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ "${{ inputs.tag }}" == "" ]; then echo "BUILD_SUFFIX=desktop-manual-trigger" >> $GITHUB_ENV echo "TYPE=MANUAL" >> $GITHUB_ENV elif [ "${{ github.event_name }}" == "push" ] && [ "${{ github.ref }}" == "refs/heads/post-zephry-link-channel" ]; then - echo "TYPE=MASTER" >> $GITHUB_ENV echo "BUILD_SUFFIX=desktop-master-push" >> $GITHUB_ENV + echo "TYPE=MASTER" >> $GITHUB_ENV echo "ZEPHYR_ENABLE=true" >> $GITHUB_ENV elif [ "${{ inputs.tag }}" != "" ]; then @@ -276,7 +275,7 @@ jobs: echo "TYPE=RELEASE" >> $GITHUB_ENV echo "ZEPHYR_ENABLE=true" >> $GITHUB_ENV - elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then + elif [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ "${{ inputs.tag }}" == "" ]; then echo "BUILD_SUFFIX=desktop-manual-trigger" >> $GITHUB_ENV echo "TYPE=MANUAL" >> $GITHUB_ENV @@ -286,8 +285,8 @@ jobs: echo "ZEPHYR_ENABLE=true" >> $GITHUB_ENV elif [ "${{ inputs.tag }}" != "" ]; then - echo "BUILD_SUFFIX=desktop-nightly" >> $GITHUB_ENV echo "TYPE=NIGHTLY" >> $GITHUB_ENV + echo "BUILD_SUFFIX=desktop-nightly" >> $GITHUB_ENV echo "ZEPHYR_ENABLE=true" >> $GITHUB_ENV fi