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

Add condition for not being on trunk when pushing in format CI #1466

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

tvami
Copy link
Member

@tvami tvami commented Sep 18, 2024

I am updating ldmx-sw, here are the details.

What are the issues that this addresses?

Format check fails on trunk
https://github.com/LDMX-Software/ldmx-sw/actions/runs/10923712245/job/30321004467
because there is nothing to commit (which I tested already, and works) BUT now we are also not on a PR branch but on trunk (this I couldn't test until the prev PR was merged).

Check List

  • I successfully compiled ldmx-sw with my developments
  • I ran my developments and the following shows that they are successful.

Post-merge comment: indeed push was skipped on trunk https://github.com/LDMX-Software/ldmx-sw/actions/runs/10924826800/job/30324837501

@tvami tvami force-pushed the iss1457-auto-commit-clang-format branch from 23a842e to ae7892b Compare September 18, 2024 14:54
@tvami tvami changed the title Remove the OR from commit step in format-check CI Add condition for not being on trunk when pushing in format CI Sep 18, 2024
Copy link
Member

@tomeichlersmith tomeichlersmith left a comment

Choose a reason for hiding this comment

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

Going to use my unlimited power ™️ to merge this since we can only really test this on trunk.

@tomeichlersmith tomeichlersmith merged commit a129edc into trunk Sep 18, 2024
1 of 3 checks passed
@tomeichlersmith tomeichlersmith deleted the iss1457-auto-commit-clang-format branch September 18, 2024 15:00
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.

2 participants