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: only skip azure on PRs #2110

Merged
merged 2 commits into from
Oct 30, 2024
Merged

fix: only skip azure on PRs #2110

merged 2 commits into from
Oct 30, 2024

Conversation

beckermr
Copy link
Member

@beckermr beckermr commented Oct 30, 2024

Checklist

  • Added a news entry
  • Regenerated schema JSON if schema altered (python conda_smithy/schema.py)

live tests:

@beckermr beckermr marked this pull request as ready for review October 30, 2024 11:47
@beckermr beckermr requested a review from a team as a code owner October 30, 2024 11:47
@beckermr
Copy link
Member Author

@conda-forge/core @jaimergp this one is ready for review!

Copy link
Member

@jaimergp jaimergp left a comment

Choose a reason for hiding this comment

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

Hm, I see. The merge commit in PRs needs to be skipped, but not once merged. We can either do what you are doing right now, or parametrize the git log command so it only uses --skip=1 in PRs. But since main does respect the skip ci stuff natively, I think we are fine with this.

@beckermr beckermr merged commit fda5fd1 into main Oct 30, 2024
2 checks passed
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