diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 31d485a80d5a4..ec0e6b584a6ad 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -89,7 +89,7 @@ jobs: id: sync-branch run: | apache_spark_ref=`git rev-parse HEAD` - git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF##*/} + git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF#refs/heads/} git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' merge --no-commit --progress --squash FETCH_HEAD git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' commit -m "Merged commit" echo "::set-output name=APACHE_SPARK_REF::$apache_spark_ref" @@ -186,7 +186,7 @@ jobs: id: sync-branch run: | apache_spark_ref=`git rev-parse HEAD` - git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF##*/} + git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF#refs/heads/} git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' merge --no-commit --progress --squash FETCH_HEAD git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' commit -m "Merged commit" echo "::set-output name=APACHE_SPARK_REF::$apache_spark_ref" @@ -262,7 +262,7 @@ jobs: id: sync-branch run: | apache_spark_ref=`git rev-parse HEAD` - git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF##*/} + git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF#refs/heads/} git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' merge --no-commit --progress --squash FETCH_HEAD git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' commit -m "Merged commit" echo "::set-output name=APACHE_SPARK_REF::$apache_spark_ref"