Extra commit when commiting

[estensen]

I'm trying to create a workflow that generates a file and then commits this file. This should happen on a separate branch and be merged when the action is complete. I currently use another action to merge and delete the branch.

workflow.yaml

    - name: Add changes
      run: |
        git config --local user.email "[email protected]"
        git config --local user.name "GitHub Action"
        git commit -m "Add pipeline" -a

    - name: Commit
      uses: ad-m/github-push-action@master
      with:
        github_token: ${{ secrets.GITHUB_TOKEN }}
        branch: ${{ github.HEAD_REF }}

    - name: Merge and delete branch
      uses: estensen/auto_merge_my_pull_requests@master
      with:
        github_token: ${{ secrets.GITHUB_TOKEN }}

When I specify branch: ${{ github.HEAD_REF }} an extra commit is created where some merging is done.

With branch: ${{ github.BRANCH }} the branch is merged and then the commit is applied.

With branch: ${{ github.REF }} I get the error:

Push to branch refs/pull/25/merge
To https://github.com/estensen/python-actions.git
 ! [remote rejected] HEAD -> refs/pull/25/merge (deny updating a hidden ref)
error: failed to push some refs to 'https://estensen:***@github.com/estensen/python-actions.git'

Overview here.

Is it possible to have the commit happen on the branch without creating the extra merge commit?

[estensen]

Solved this by specifying the correct ref when checking out:

- uses: actions/checkout@v1
  with:
    ref: refs/heads/${{ github.head_ref }}

[kenorb]

I think I've got the same issue.

My configuration is like:

  Push:
    if: github.event_name == 'pull_request'
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
        with:
          persist-credentials: false
          # Otherwise, you will failed to push refs to dest repo.
          fetch-depth: 0
          ref: refs/heads/${{ github.head_ref }}
      - uses: actions/download-artifact@v2
         name: MyArtifact
      - name: Commit files
        run: |
          git config --local core.autocrlf false
          git config --local user.email $git_email
          git config --local user.name "${{ github.actor }}"
          git add . && git add --renormalize .
          git pull origin "${{ github.ref }}" --autostash --rebase -Xours
          git commit -am "${{ github.workflow }}"
        env:
          git_email: "${{ github.actor }}@users.noreply.github.com"
      - name: Push changes (not PR)
        if: github.event_name != 'pull_request'
        uses: ad-m/github-push-action@master
        with:
          branch: ${{ github.ref }}
          github_token: ${{ secrets.GITHUB_TOKEN }}
      - name: Push changes (PR)
        if: github.event_name == 'pull_request'
        uses: ad-m/github-push-action@master
        with:
          branch: refs/heads/${{ github.head_ref }}
          github_token: ${{ secrets.GITHUB_TOKEN }}

Specifying ref: refs/heads/${{ github.head_ref }} as suggested didn't help.

[kenorb]

Related:

• Push issue #44
• on pull request, checkout@v2 built some ref other than the one that was claimed actions/checkout#237
• Checking out wrong commit? actions/checkout#299

[murilogok]

Solved this issue (deny updating a hidden ref) with:

     with:
        github_token: ${{ secrets.GITHUB_TOKEN }}
        branch: ${{ github.head_ref }} <---- Add this
        force: true