diff --git a/.github/workflows/build-check-install.yaml b/.github/workflows/build-check-install.yaml index 2de0ae99..55b2f958 100644 --- a/.github/workflows/build-check-install.yaml +++ b/.github/workflows/build-check-install.yaml @@ -302,8 +302,8 @@ jobs: ref: ${{ steps.branch-name.outputs.head_ref_branch }} path: ${{ github.event.repository.name }} repository: ${{ github.event.pull_request.head.repo.full_name }} - # When fetch-depth is set to default 1, and if additional commits are added - # to the branch between this step and Set TESTING_DEPTH, git might fail + # When fetch-depth is set to 1 (default), and if additional commits are added + # to the branch between this step and the 'Set TESTING_DEPTH' step, git might fail # referencing ${{ github.event.after }} commit # because it's not the latest commit fetched by this step. fetch-depth: 0 diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml index 081b63a4..ab094d1d 100644 --- a/.github/workflows/style.yaml +++ b/.github/workflows/style.yaml @@ -138,9 +138,9 @@ jobs: run: | git config --global user.name 'github-actions' git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com' - git add ${{ steps.problem-files.outputs.unstyled-files }} git config pull.rebase false git pull origin ${{ steps.branch-name.outputs.head_ref_branch }} || true + git add ${{ steps.problem-files.outputs.unstyled-files }} git commit -m '[skip style] [skip vbump] Restyle files' git push -v origin HEAD:${{ steps.branch-name.outputs.head_ref_branch }} || \ echo "⚠️ Could not push to ${BRANCH_NAME} on $(git remote -v show -n origin | grep Push)"