AR.js icon indicating copy to clipboard operation
AR.js copied to clipboard

Removed PR #560 from master, present in dev

Open nickw1 opened this issue 1 year ago • 1 comments

PR #560 merge was intended for dev, unintentionally added to master.

nickw1 avatar Sep 12 '24 19:09 nickw1

Hi @kalwalt, PR #560 was inadvertently merged into master, should have been only in dev. I've reverted the changes in the PR with this new PR #610, in order to keep master clean. Are you able to approve this revert? Thanks.

nickw1 avatar Sep 12 '24 19:09 nickw1

@kalwalt Great, can you review the PR? (I am unable to merge without an approving review).

Thanks.

nickw1 avatar Oct 29 '24 10:10 nickw1

@kalwalt Many thanks - done!

nickw1 avatar Oct 29 '24 20:10 nickw1

@kalwalt sorry, I've noticed that the CI is failing due to master being a protected branch. It also reports that "changes must be made through a pull request".

https://github.com/AR-js-org/AR.js/actions/runs/11581567636/job/32242622440

The odd thing is that it has actually merged the PR successfully.

Do we want to un-protect the master branch temporarily just to get the CI to work, otherwise it looks to people browsing the repo that something is wrong?

nickw1 avatar Oct 30 '24 08:10 nickw1

@kalwalt sorry, I've noticed that the CI is failing due to master being a protected branch. It also reports that "changes must be made through a pull request".

https://github.com/AR-js-org/AR.js/actions/runs/11581567636/job/32242622440

The odd thing is that it has actually merged the PR successfully.

Do we want to un-protected the master branch temporarily just to get the CI to work, otherwise it looks to people browsing the repo that something is wrong?

This Is odd, i will look into It this evening.🙂

kalwalt avatar Oct 30 '24 09:10 kalwalt

@nickw1 The only way to solve this was, as you suggested, to temporary unset the master branch protection rule, probably a bug with the EndCommit github action packagage or something related. I will open an issue to keep track of this.

kalwalt avatar Oct 30 '24 16:10 kalwalt