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): sort .license.ignore locally before diff #4106

Merged
merged 2 commits into from
May 17, 2022

Conversation

sdbondi
Copy link
Member

@sdbondi sdbondi commented May 17, 2022

Description

  • sorts license.ignore localy before diffing

Motivation and Context

The license check does not always pass. I'm not really able to explain why it is flaky but on my local linux machine
it does not pass because the sort command behaves slightly differently.

This PR sorts the ignore file locally so that we can be sure the sorting is consistent before the diff.

How Has This Been Tested?

Manually run ./scripts/file_license_check.sh


DIFFS=$(diff -u .license.ignore /tmp/rgtemp)
# sort the .license.ignore file as sorting seems to behave differently on different platforms
cat .license.ignore | sort > /tmp/.license.ignore
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
cat .license.ignore | sort > /tmp/.license.ignore
sort .license.ignore > /tmp/.license.ignore

@aviator-app aviator-app bot merged commit 8594754 into tari-project:development May 17, 2022
@sdbondi sdbondi deleted the license-check-fix branch May 17, 2022 15:19
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.

3 participants