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

Use ~/.ooniprobe as the home directory #101

Merged
merged 2 commits into from
Jan 27, 2020
Merged

Use ~/.ooniprobe as the home directory #101

merged 2 commits into from
Jan 27, 2020

Conversation

hellais
Copy link
Member

@hellais hellais commented Jan 27, 2020

Remove all probe-legacy related to code since there is no more conflict
between the two
Fixes: ooni/probe#972

Remove all probe-legacy related to code since there is no more conflict
between the two
Fixes: ooni/probe#972
Copy link
Member

@bassosimone bassosimone left a comment

Choose a reason for hiding this comment

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

🐳

.gitignore Outdated
@@ -1,6 +1,7 @@
/dist
/ooniprobe
/coverage.cov
/ooni.cov
Copy link
Member

Choose a reason for hiding this comment

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

Why do we have two differently named files for coverage?

Copy link
Member Author

Choose a reason for hiding this comment

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

I suspect coverage.cov is how it used to be called at some point in the past. Maybe we should look into dropping that one from the .gitignore or maybe just do .gitignore for *.cov?

Copy link
Member

Choose a reason for hiding this comment

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

I am confused by what I see, tho:

sbs@synchronicity probe-cli % git grep ooni.cov
sbs@synchronicity probe-cli % git grep coverage.cov
.gitignore:/coverage.cov
build.sh:  $0 __docker go test -v -coverprofile=coverage.cov -coverpkg=./... ./...
build.sh:          -coverprofile=coverage.cov -service=travis-ci
build.sh:  go test -v -race -coverprofile=coverage.cov -coverpkg=./... ./...
sbs@synchronicity probe-cli % git branch 
* issue/973
  master

Copy link
Member

Choose a reason for hiding this comment

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

(issue/973 is branched off the current master)

Copy link
Member Author

Choose a reason for hiding this comment

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

probe-cli [fix/ooni_home] % ls -l ooni.cov
-rw-r--r--  1 x  staff  16043 Dec  2 14:17 ooni.cov

Hum ok, maybe this was an old file I had lying around from a time prior to some refactor?

Copy link
Member

Choose a reason for hiding this comment

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

ah, could be!

@bassosimone
Copy link
Member

I'm going to squash and merge (need to merge another PR soon and tag a release).

@bassosimone bassosimone merged commit 8dff1cc into master Jan 27, 2020
@bassosimone bassosimone deleted the fix/ooni_home branch January 27, 2020 14:19
ainghazal pushed a commit to ainghazal/probe-cli that referenced this pull request Mar 8, 2022
* Use ~/.ooniprobe as the home directory

Remove all probe-legacy related to code since there is no more conflict
between the two
Fixes: ooni/probe#972

* Update .gitignore

Co-authored-by: Simone Basso <bassosimone@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants