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

ci: Pass tests under macOS #340

Merged
merged 5 commits into from
Feb 16, 2024

Conversation

hyperupcall
Copy link
Contributor

@hyperupcall hyperupcall commented Jan 13, 2024

Related: Fixes #294

Description

This fixes the tests so macOS CI passes. There were two main issues:

  • osx wc printing unexpected spaces
    • trimmed the spaces with tr
  • set -U not working on macOS (currently fish version 3.7)
    • to fix this, erasing the variable before setting it somehow made it work

First contribution?

Check the 👍 Contribute section and the contributing guide.

Acceptance Checks

  • documentation is up-to-date:
  • feature flag is present in conf.d/pure.fish ;
  • symbol is present in conf.d/pure.fish ;
  • tests are passing (I can help you 🤗 ):
  • customization is available ;
  • feature is implemented.

Copy link
Member

@edouard-lopez edouard-lopez left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution!
Some changes to do and we should be good

.github/workflows/ci.yml Show resolved Hide resolved
tests/_pure_is_inside_container.test.fish Outdated Show resolved Hide resolved
@hyperupcall
Copy link
Contributor Author

@edouard-lopez I've updated the tests to use a dedicated container test for macOS and Linux, but I don't think it's possible to specify a particular version of Fish to install with Homebrew. Usually, only the latest versions are supported. Some applications like postgres do have multiple versions and some applications do have custom taps with multiple versions, but that does not seem to be the case for Fish. Maybe that could be fixed by someone a follow-up PR?

@edouard-lopez edouard-lopez added the 🚀 enhancement performance, UX or maintainability label Jan 24, 2024
Copy link
Member

@edouard-lopez edouard-lopez left a comment

Choose a reason for hiding this comment

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

I introduced a regression with the code I suggested that added an extra end on each block. Could you update and then rebase on master ?

tests/_pure_is_inside_container.test.fish Outdated Show resolved Hide resolved
tests/_pure_is_inside_container.test.fish Outdated Show resolved Hide resolved
@edouard-lopez
Copy link
Member

There is an issue with not ok 97 _pure_is_inside_container: true for Github Action on Ubuntu. I will have a look

@edouard-lopez
Copy link
Member

The failure was due to error in the test file (not cleaning a mocked method), I will fix in #347

@edouard-lopez edouard-lopez merged commit ad85368 into pure-fish:master Feb 16, 2024
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🚀 enhancement performance, UX or maintainability
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add CI for MacOS
2 participants