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

update deps + change res path #118

Merged
merged 7 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ labels: bug

#### Logs

On linux, run `flatpak run io.github.wiiznokes.fan-control` in a terminal.
On linux, run `flatpak run io.github.wiiznokes.fan-control` in a terminal.
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ jobs:
- run: rustup update
- uses: taiki-e/install-action@just
- uses: Swatinem/rust-cache@v2
- name: Install deps
if: startsWith(matrix.os, 'ubuntu')
run: sudo apt-get update && sudo apt-get install pkg-config libxkbcommon-dev

- name: Build libsensors on Ubuntu
if: startsWith(matrix.os, 'ubuntu')
Expand Down Expand Up @@ -71,6 +74,9 @@ jobs:
- run: rustup update
- uses: taiki-e/install-action@just
- uses: Swatinem/rust-cache@v2
- name: Install deps
if: startsWith(matrix.os, 'ubuntu')
run: sudo apt-get update && sudo apt-get install pkg-config libxkbcommon-dev

- name: Build libsensors on Ubuntu
if: startsWith(matrix.os, 'ubuntu')
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ build/
/.flatpak-builder
/vendor
/repo
/flatpak-out
/flatpak-out
package-lock.json
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ The name of the folders follow [this convention](https://en.wikipedia.org/wiki/L

Support for [pontoon](https://github.com/mozilla/pontoon) (a tool for making translation) will be added at some point.

You can also translate the [metainfo](./resource/linux/metainfo.xml) file and the [desktop entry](./resource/linux/desktop_entry.desktop).
You can also translate the [metainfo](./res/linux/metainfo.xml) file and the [desktop entry](./res/linux/desktop_entry.desktop).

<strong> Please don't translate the README, this will not be merged. </strong>
Loading
Loading