Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed PR #560 from master, present in dev #610

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Removed PR #560 from master, present in dev #610

merged 1 commit into from
Oct 29, 2024

Conversation

nickw1
Copy link
Collaborator

@nickw1 nickw1 commented Sep 12, 2024

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

@nickw1
Copy link
Collaborator Author

nickw1 commented Sep 12, 2024

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.

Copy link
Member

@kalwalt kalwalt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reading the code, I think you correctly reverted the code.

@nickw1
Copy link
Collaborator Author

nickw1 commented Oct 29, 2024

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

Thanks.

@kalwalt kalwalt added enhancement New feature or request location based labels Oct 29, 2024
Copy link
Member

@kalwalt kalwalt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All is fine! it can be merged.

@nickw1 nickw1 merged commit 7e63ff7 into master Oct 29, 2024
3 checks passed
@nickw1
Copy link
Collaborator Author

nickw1 commented Oct 29, 2024

@kalwalt Many thanks - done!

@nickw1
Copy link
Collaborator Author

nickw1 commented Oct 30, 2024

@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?

@kalwalt
Copy link
Member

kalwalt commented Oct 30, 2024

@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
Copy link
Member

kalwalt commented Oct 30, 2024

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request location based
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants