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

Publishing: Improve diff comparison when on custom branch #1058

Merged
merged 21 commits into from
Mar 3, 2022

Conversation

MariusStorhaug
Copy link
Contributor

@MariusStorhaug MariusStorhaug commented Mar 1, 2022

Change

Fix the publishing logic, so it works as expected in different scenarios. When doing prerelease in custom branch, it now compares whole content of the branch with the main/master branch to determine if a change has happened on a module. Old logic required a change to be on the last commit.

image

Behavior when running on custom branch with multiple commits where first commit was a change on version file for shares:

GitHub:
https://github.com/MariusStorhaug/ResourceModules/runs/5413150374?check_suite_focus=true#step:4:243

ADO:
image

Behavior when merging after a PR:

GitHub:
https://github.com/MariusStorhaug/ResourceModules/runs/5413219475?check_suite_focus=true#step:4:243

ADO:
image

Type of Change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update (Wiki)

Checklist

  • I'm sure there are no other open Pull Requests for the same update/change
  • My corresponding pipelines / checks run clean and green without any errors or warnings
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (readme)
  • I did format my code

@MariusStorhaug MariusStorhaug marked this pull request as ready for review March 3, 2022 20:55
@MariusStorhaug MariusStorhaug changed the title Users/mast/publish diff fix Publishing: Improve diff comparison when on custom branch Mar 3, 2022
@MariusStorhaug MariusStorhaug enabled auto-merge (squash) March 3, 2022 21:03
@MariusStorhaug MariusStorhaug merged commit 3fb40b1 into main Mar 3, 2022
@MariusStorhaug MariusStorhaug deleted the users/mast/publishDiffFix branch March 3, 2022 21:42
@MariusStorhaug MariusStorhaug self-assigned this Mar 3, 2022
@MariusStorhaug MariusStorhaug linked an issue Mar 12, 2022 that may be closed by this pull request
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.

Publishing: Investigate diff comparison vs. main in ADO
3 participants