Skip to content

Commit

Permalink
fix: update icons and fix LFS to resolve build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
ok-nick committed Apr 23, 2024
1 parent 0f6017e commit bc7347c
Show file tree
Hide file tree
Showing 25 changed files with 53 additions and 58 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
assets/** filter=lfs diff=lfs merge=lfs -text
frontend/assets/** filter=lfs diff=lfs merge=lfs -text
assets/**/* filter=lfs diff=lfs merge=lfs -text
frontend/assets/**/* filter=lfs diff=lfs merge=lfs -text
51 changes: 25 additions & 26 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,31 @@ on:
- ".github/workflows/check.yml"

jobs:
# TODO: weird issue with icon invalid PNG signature
# lint:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4

# - uses: dtolnay/rust-toolchain@stable
# with:
# components: clippy

# - uses: Swatinem/rust-cache@v2

# - name: install dependencies (ubuntu only)
# run: |
# sudo apt-get update
# sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf

# - name: install frontend dependencies
# run: |
# cd frontend
# npm install

# - name: clippy
# run: cargo clippy
# env:
# RUSTFLAGS: "-Dwarnings"
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: dtolnay/rust-toolchain@stable
with:
components: clippy

- uses: Swatinem/rust-cache@v2

- name: install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
- name: install frontend dependencies
run: |
cd frontend
npm install
- name: clippy
run: cargo clippy
env:
RUSTFLAGS: "-Dwarnings"

format:
runs-on: ubuntu-latest
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ jobs:
fail-fast: false
matrix:
settings:
# TODO: for some reason aarch64 builds are corrupt
- platform: 'macos-latest'
args: '--target aarch64-apple-darwin'
- platform: 'macos-latest'
args: '--target x86_64-apple-darwin'
- platform: 'ubuntu-latest'
- platform: 'ubuntu-20.04'
args: ''
- platform: 'windows-latest'
args: ''
Expand All @@ -40,7 +41,7 @@ jobs:
- uses: Swatinem/rust-cache@v2

- name: install dependencies (ubuntu only)
if: matrix.settings.platform == 'ubuntu-latest'
if: matrix.settings.platform == 'ubuntu-20.04'
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
Expand All @@ -54,8 +55,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tagName: app-v__VERSION__
releaseName: 'App v__VERSION__'
tagName: v__VERSION__
releaseName: 'v__VERSION__'
releaseBody: 'See the assets to download this version and install.'
releaseDraft: true
prerelease: false
Expand Down
12 changes: 9 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
tauri-build = { version = "1.5.1", features = [] }

[dependencies]
tauri = { version = "1.6.1", features = [
tauri = { version = "1.6.2", features = [
"dialog-open",
"shell-open",
"fs-read-file",
Expand Down
Binary file modified assets/icons/128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/128x128@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square107x107Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square142x142Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square150x150Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square284x284Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square30x30Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square310x310Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square44x44Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square71x71Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/Square89x89Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/StoreLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/icon.icns
Binary file not shown.
Binary file modified assets/icons/icon.ico
Binary file not shown.
Binary file modified assets/icons/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/screenshots/home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"tauri": "tauri"
},
"dependencies": {
"@tauri-apps/api": "^1",
"@tauri-apps/api": "^1.5.4",
"c2pa": "^0.20.0",
"c2pa-wc": "^0.11.18",
"mime": "^4.0.1"
},
"devDependencies": {
"@tauri-apps/cli": "^1",
"@tauri-apps/cli": "^1.5.11",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@typescript-eslint/eslint-plugin": "^7.3.0",
"@typescript-eslint/parser": "^7.3.0",
Expand Down
15 changes: 2 additions & 13 deletions tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"beforeDevCommand": "npm run dev",
"beforeBuildCommand": "npm run build",
"devPath": "http://localhost:1420",
"devPath": "http://localhost:3000",
"distDir": "frontend/dist",
"withGlobalTauri": true
},
Expand Down Expand Up @@ -44,18 +44,7 @@
"assets/icons/128x128.png",
"assets/icons/128x128@2x.png",
"assets/icons/icon.icns",
"assets/icons/icon.ico",
"assets/icons/icon.png",
"assets/icons/Square30x30Logo.png",
"assets/icons/Square44x44Logo.png",
"assets/icons/Square71x71Logo.png",
"assets/icons/Square89x89Logo.png",
"assets/icons/Square107x107Logo.png",
"assets/icons/Square142x142Logo.png",
"assets/icons/Square150x150Logo.png",
"assets/icons/Square284x284Logo.png",
"assets/icons/Square310x310Logo.png",
"assets/icons/StoreLogo.png"
"assets/icons/icon.ico"
]
},
"cli": {
Expand Down

0 comments on commit bc7347c

Please sign in to comment.