Push only tags (not commits) during nx release (avoid git error)?

[jhpedemonte]

Is there a way to only push tags (no commits) during nx release?

Our CI flow calls nx release on the main branch only after build and tests have passed, which can take some time. Then, nx release will create tags (e.g. git tag --annotate pkg@1.2.3 --message pkg@1.2.3), followed by pushing to remote repo (git push --follow-tags --no-verify --atomic).

The problem happens if someone else merges into the branch after the CI process has pulled the branch but before calling nx release. The git push ... fails because the local branch is now out of date with the remote branch:

Error: Unexpected git push error: To https://<HOST>/<ORG>/<REPO>
 ! [rejected]          main -> main (non-fast-forward)
 ! [rejected]          pkg@1.2.3 -> pkg@1.2.3 (atomic push failed)
error: failed to push some refs to 'https://<HOST>/<ORG>/<REPO>'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
    at gitPush (/app/node_modules/nx/src/command-line/release/utils/git.js:411:15)
    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
    at async ReleaseClient.release (/app/node_modules/nx/src/command-line/release/release.js:193:13)
    at async <anonymous> (/app/scripts/release.ts:102:3)

But I just want to push up the tags only. I have release.git.commit set to false. Is there some way to do this and avoid the error above?

[jhpedemonte]

The code specifically --follow-tags for git push. Docs for that says it will push commits as well as any annotated tags. The "push commits" part is what's causing the error above (even though I specifically set release.git.commit: false).

So one possible solution would be to set release.git.pushArgs (used here when invoking git push cmd):

// nx.json
"release": {
  "git": {
    "commit": false,
    "pushArgs": "--no-follow-tags --tags"
  }
}

This would disable follow-tags (so it wouldn't try to push up any commits) and then push up any tags. But I'm concerned about this approach due to this comment in the code:

// NOTE: It's important we use --follow-tags, and not --tags, so that we are precise about what we are pushing