example-package icon indicating copy to clipboard operation
example-package copied to clipboard

! [remote rejected] main -> main (cannot lock ref 'refs/heads/main':

Open ianlewis opened this issue 2 years ago • 2 comments

Most of the e2e test workflows commit and push a change and if two workflows do this at the same time the remove will reject the change because it's non-linear.

Cloning into 'example-package'...
/home/runner/work/example-package/example-package/example-package
[main 431364b7] .github/workflows/e2e.nodejs.tag.main.unscoped.slsa3.yml
 2 files changed, 3 insertions(+), 3 deletions(-)
To https://github.com/slsa-framework/example-package.git
 ! [remote rejected]   main -> main (cannot lock ref 'refs/heads/main': is at 66[9](https://github.com/slsa-framework/example-package/actions/runs/5698916646/job/15447297517#step:3:10)41e6196d60ec8a5f14cc3cd5764037bad4e82 but expected cdec69331ca3b4565378c23c6f917d5f89426a3a)
error: failed to push some refs to 'https://github.com/slsa-framework/example-package.git'

ianlewis avatar Jul 31 '23 02:07 ianlewis

Another error with the same cause

error: failed to push some refs to 'https://github.com/slsa-framework/example-package.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

ianlewis avatar Jul 31 '23 06:07 ianlewis

Maybe the bootstrap script can retry a number of times?

ianlewis avatar Jul 31 '23 06:07 ianlewis