From b38f9e3728c7ca7b2fc91ede039c37423253bcd2 Mon Sep 17 00:00:00 2001 From: Marco Carrozzo Date: Mon, 9 Jan 2023 19:35:18 +0100 Subject: [PATCH] use github base ref --- .github/actions/before-install/action.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/before-install/action.yml b/.github/actions/before-install/action.yml index 24c968cfa7..2c9e2dc19b 100644 --- a/.github/actions/before-install/action.yml +++ b/.github/actions/before-install/action.yml @@ -20,7 +20,7 @@ runs: run: | { echo "GIT_HASH=$(git rev-parse HEAD)"; - echo "BASE_HASH=$(git merge-base origin/${{ github.ref }} HEAD)"; + echo "BASE_HASH=$(git merge-base origin/${GITHUB_BASE_REF} HEAD)"; echo "HEAD_HASH=HEAD"; echo "HEAD_COMMIT_HASH=${TRAVIS_PULL_REQUEST_SHA:-${TRAVIS_COMMIT}}"; echo "NX_CALCULATION_FLAGS=--all"; @@ -62,13 +62,13 @@ runs: echo "BREAK_ACTION=true" >> $GITHUB_ENV - name: PULL_REQUEST - if: ${{ github.event_name == 'pull_request' && github.ref_name == 'develop' }} + if: ${{ github.event_name == 'pull_request' }} shell: bash run: | echo "Setting up CI flags for Pull Request on develop branch" - NX_CALCULATION_FLAGS="--base=origin/${{ github.ref_name }} --head=$HEAD_HASH" + NX_CALCULATION_FLAGS="--base=origin/${GITHUB_BASE_REF} --head=$HEAD_HASH" echo "NX_CALCULATION_FLAGS=$NX_CALCULATION_FLAGS" >> $GITHUB_ENV - BASE_HASH="origin/${{ github.ref_name }}" + BASE_HASH="origin/GITHUB_BASE_REF${}" - name: SCHEDULE if: ${{ github.event_name == 'schedule' }}