Skip to content

Commit

Permalink
Merge pull request #73 from fosslife/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Sparkenstein authored Jun 19, 2024
2 parents 6d98dcc + 0baaadc commit 73a2fdc
Show file tree
Hide file tree
Showing 4 changed files with 8,120 additions and 8,109 deletions.
21 changes: 16 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest]
include:
- platform: "macos-latest" # for Arm based macs (M1 and above).
args: "--target aarch64-apple-darwin"
- platform: "macos-latest" # for Intel based macs.
args: "--target x86_64-apple-darwin"
- platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
args: ""
- platform: "windows-latest"
args: ""

runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -22,20 +30,23 @@ jobs:
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: lts/*
cache: "yarn"

- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}

- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
- name: install frontend dependencies
run: yarn install # change this to npm or pnpm depending on which one you use
run: yarn install --immutable # change this to npm or pnpm depending on which one you use

- uses: tauri-apps/tauri-action@v0
env:
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/src/commands/image.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub mod images {
use anyhow::Result;
use image::{codecs::jpeg::JpegEncoder, ImageEncoder};
use image::codecs::jpeg::JpegEncoder;
use oxipng::{optimize, InFile, Options, OutFile};
use rayon::prelude::*;
use serde::Deserialize;
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/src/commands/image_compressor.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pub mod images {
use std::{ops::Deref, path::Path};
use std::path::Path;

use image::{
codecs::{
Expand Down
Loading

0 comments on commit 73a2fdc

Please sign in to comment.