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

Support ~ in path with resolve-dir #238

Merged
merged 4 commits into from
May 5, 2020
Merged

Support ~ in path with resolve-dir #238

merged 4 commits into from
May 5, 2020

Conversation

piecioshka
Copy link
Contributor

No description provided.

@GantMan
Copy link
Member

GantMan commented May 26, 2019

Sorry for the delay, can you see about updating the tests to pass?

@piecioshka
Copy link
Contributor Author

@GantMan Sorry for my delay. Everything should works.

I can't see that tests on Semaphore CI work, but on Travis is occur a problem with running them.

@GantMan
Copy link
Member

GantMan commented Apr 28, 2020

@piecioshka - please resolve the conflict and tests should pass.

* master:
  fix custom error bug, add test, fix typo, refactor test (#257)
@piecioshka
Copy link
Contributor Author

@GantMan Done.

Do you know what happen on Travis?

@GantMan
Copy link
Member

GantMan commented Apr 28, 2020

No I do not. It has this error:
image

I'm gonna re-run it.

@tabrindle
Copy link
Contributor

if you have that error, its because yarn has to update its lockfile, but --frozen-lockfile prevents it from doing so. A good idea on ci. The fix is simple - rerun yarn locally, and push the changes to the lockfile. Which makes sense here because the package.json was changed, and with no changes to yarn.lock

@GantMan
Copy link
Member

GantMan commented Apr 29, 2020

@piecioshka - once this is merged, I'll release a new version.

@codecov
Copy link

codecov bot commented May 5, 2020

Codecov Report

Merging #238 into master will increase coverage by 0.02%.
The diff coverage is 50.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #238      +/-   ##
==========================================
+ Coverage   83.49%   83.52%   +0.02%     
==========================================
  Files          36       36              
  Lines         709      710       +1     
  Branches      139      139              
==========================================
+ Hits          592      593       +1     
  Misses         75       75              
  Partials       42       42              
Impacted Files Coverage Δ
src/extensions/functions/checkFile.ts 87.50% <50.00%> (+1.78%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ad56278...35adc29. Read the comment docs.

@piecioshka
Copy link
Contributor Author

Hi @GantMan!

I updated yarn.lock file (what @tabrindle told).
We cannot merge this PR because we have a problem with a new service that is used — codecov/patch

How can we resolve that issue?

@GantMan GantMan merged commit 7d36c90 into infinitered:master May 5, 2020
@GantMan
Copy link
Member

GantMan commented May 5, 2020

merged!

@piecioshka piecioshka deleted the feature/resolve-dir branch May 5, 2020 19:48
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.

4 participants