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

Fix CI to run on master without duplicate push and pull_request runs #132

Closed
wants to merge 1 commit into from

Conversation

cclauss
Copy link
Contributor

@cclauss cclauss commented Mar 5, 2023

That weird construct under on: allows the GHA to run on push OR pull_request to the master branch but NOT both.

@jdevera
Copy link
Collaborator

jdevera commented Aug 13, 2023

Thank you for this PR. I think it is a step in the right direction.

It has also helped bring up some questions for @un33k:
While reviewing it, I found that the 3 workflow files are identical except for the branches they apply to and that there seem to be 5 special branches:

  • master
  • ci
  • staging
  • sandbox
  • dev

My first question is whether we need anything other than the master branch. And if we do, then what is the branch workflow?

Asking because, in my possibly over-simplified view, we only need the change this PR introduces, and then we can eliminate the other branches. We get the CI to run on each PR change, and then once more when it has been merged. The other two workflow files could then be removed. And it'd be awesome to repurpose this PR for that.

@un33k
Copy link
Owner

un33k commented Aug 15, 2023

Please be advised that PRs should be raised against the 'staging' branch. The reason for this is that many PRs don't properly update versions, add change logs, or credit authors. This means additional work is needed. Once staging is approved, it triggers the CI, and if passed, it will be merged into 'master'. The 'sandbox' is reserved for my personal items. The flow is as follows: clone -> checkout (dev) -> PR to staging -> merge (via CI) -> merge to 'master'. While this process may seem extensive, it's what we've evolved to. We could transition to a dev/ci/main structure in the future, but currently, the package is stable with few changes.

@un33k
Copy link
Owner

un33k commented Aug 15, 2023

Contributors/Collaborators - Please feel free to approve and merge.

@cclauss cclauss closed this Aug 15, 2023
@cclauss cclauss deleted the patch-1 branch August 15, 2023 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants