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

Bump axum from 0.7.2 to 0.7.3 in /src-tauri #39

Merged
merged 11 commits into from
Jan 5, 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
25 changes: 16 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,36 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-20.04, windows-latest]
platform: [ubuntu-22.04, windows-latest]
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
# You can remove libayatana-appindicator3-dev if you don't use the system tray feature.
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install libgtk-3-dev webkit2gtk-4.1 libappindicator3-dev librsvg2-dev patchelf
- name: Check glib-2.0 installation
if: matrix.platform == 'ubuntu-22.04'
env:
PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig"

# You can remove libayatana-appindicator3-dev if you don't use the system tray feature.
run: dpkg -l libglib2.0-dev


- name: Rust setup
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@nightly

- name: Rust cache
uses: swatinem/rust-cache@v2
- name: Cache cargo dependencies
uses: Swatinem/rust-cache@v2
with:
workspaces: './src-tauri -> target'

shared-key: "${{ matrix.os }}"
- name: Sync node version and setup cache
uses: actions/setup-node@v4
with:
Expand All @@ -55,4 +62,4 @@ jobs:
releaseName: 'Magic Eye v__VERSION__' # tauri-action replaces \_\_VERSION\_\_ with the app version.
releaseBody: 'See the assets to download and install this version.'
releaseDraft: true
prerelease: false
prerelease: false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<br>
<a href=https://github.com/Sir-Thom><img src="https://img.shields.io/badge/Lead Dev-Thomas Toulouse-blue"></a>
<img src="https://img.shields.io/badge/Os-Linux-brightgreen">
<a href=https://github.com/Sir-Thom/Magic-eye/releases/tag/V.0.9.0><img src="https://img.shields.io/badge/Version-0.9.0-informational"></a>
<a href=https://github.com/Sir-Thom/Magic-eye/releases/tag/v.0.9.1><img src="https://img.shields.io/badge/Version-0.9.1-informational"></a>
</p>
<br>
<h3 align="center">
Expand Down
10 changes: 6 additions & 4 deletions src-tauri/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 src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ tauri-plugin-process = { version = "2.0.0-alpha" }
dirs-next = "2.0.0"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
axum = "0.7.2"
axum = "0.7.3"
tokio = { version = "1.35.1", features = ["full"] }
tower-http = { version = "0.5.0", features = ["fs", "cors"] }
reqwest = "^0.11.23"
Expand Down