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

add cmdline arg and change the XDG_DATA_DIRS #262

Merged
merged 2 commits into from Apr 27, 2022

Conversation

Y7n05h
Copy link
Contributor

@Y7n05h Y7n05h commented Jan 25, 2022

feat: Add cmdline arg which can override asset path
feat: fallback to /usr/local/share:/usr/share when XDG_DATA_DIRS is not set or empty

References:
https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

feat: fallback to /usr/local/share:/usr/share when XDG_DATA_DIRS is not set or empty
@ErikBjare
Copy link
Member

I wonder why CI isn't running?

Co-authored-by: Erik Bjäreholt <erik.bjareholt@gmail.com>
@Y7n05h
Copy link
Contributor Author

Y7n05h commented Mar 3, 2022

I wonder why CI isn't running?

When an outside contributor submits a pull request to a public repository, a maintainer with write access may need to approve any workflow runs.

https://docs.github.com/en/actions/managing-workflow-runs/approving-workflow-runs-from-public-forks

@ErikBjare
Copy link
Member

@Y7n05h Thanks for that, usually I get a message like this, but before it didn't appear for some reason:
image

It's there now though, so problem solved!

@codecov
Copy link

codecov bot commented Mar 3, 2022

Codecov Report

Merging #262 (d382b02) into master (f501a7a) will increase coverage by 0.06%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #262      +/-   ##
==========================================
+ Coverage   50.59%   50.65%   +0.06%     
==========================================
  Files          45       45              
  Lines        6151     6252     +101     
==========================================
+ Hits         3112     3167      +55     
- Misses       3039     3085      +46     
Impacted Files Coverage Δ
aw-server/src/main.rs 0.00% <0.00%> (ø)
aw-server/src/endpoints/bucket.rs 75.92% <0.00%> (-5.96%) ⬇️
aw-server/src/config.rs 46.34% <0.00%> (-2.38%) ⬇️
aw-datastore/src/worker.rs 82.72% <0.00%> (-0.24%) ⬇️
aw-server/src/macros.rs 2.59% <0.00%> (-0.04%) ⬇️
aw-datastore/src/datastore.rs 78.74% <0.00%> (+0.11%) ⬆️
aw-query/src/parser.rs 45.78% <0.00%> (+0.15%) ⬆️
aw-server/src/endpoints/mod.rs 65.71% <0.00%> (+0.32%) ⬆️

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 f501a7a...d382b02. Read the comment docs.

@ErikBjare ErikBjare merged commit 014c9c0 into ActivityWatch:master Apr 27, 2022
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

2 participants