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 line-ending related errors on MacOS (ARM64) #482

Merged
merged 26 commits into from Feb 14, 2024

Conversation

ashao
Copy link
Member

@ashao ashao commented Feb 9, 2024

For some reason, cloning Redis on Apple Silicon results in files within some of the Redis build scripts that have Windows-style line endings. This leads to errors because the interpreter for these scripts cannot be parsed correctly (e.g /bin/sh^M). To solve this, we now modify the git clone for both Redis and RedisAI to set core.autoclrf=true. This should only be done for this platform; on Linux and MacOS (x64), setting this to true ends up with the wrong line endings.

@ashao ashao requested a review from MattToast February 9, 2024 00:54
Copy link
Member

@MattToast MattToast left a comment

Choose a reason for hiding this comment

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

Some small initial nits for you to consider while you're sorting out the CI

smartsim/_core/_install/builder.py Outdated Show resolved Hide resolved
smartsim/_core/_install/builder.py Outdated Show resolved Hide resolved
smartsim/_core/_install/builder.py Outdated Show resolved Hide resolved
@MattToast MattToast dismissed their stale review February 10, 2024 01:48

Dismissing my review as I have now acted as an author

Copy link

codecov bot commented Feb 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (bbce88a) 90.01% compared to head (f9b612f) 90.85%.
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #482      +/-   ##
===========================================
+ Coverage    90.01%   90.85%   +0.83%     
===========================================
  Files           60       60              
  Lines         3826     3826              
===========================================
+ Hits          3444     3476      +32     
+ Misses         382      350      -32     

see 8 files with indirect coverage changes

Copy link
Collaborator

@al-rigazzi al-rigazzi left a comment

Choose a reason for hiding this comment

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

LGTM pending tests, thanks for coping with so many different options/variants with such a clean code.

@ashao ashao merged commit 42cdf84 into CrayLabs:develop Feb 14, 2024
34 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.

None yet

4 participants