Skip to content

Commit cd8fe52

Browse files
authored
Merge pull request #65 from CodeDead/feature/upgrades
feat: dependency upgrades, minor design upgrades, changed runner actions
2 parents 4104822 + 45df4b7 commit cd8fe52

File tree

8 files changed

+275
-248
lines changed

8 files changed

+275
-248
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
args: '--target aarch64-apple-darwin'
1919
- platform: 'macos-latest'
2020
args: '--target x86_64-apple-darwin'
21-
- platform: 'ubuntu-22.04'
22-
args: ''
23-
- platform: 'ubuntu-22.04-arm'
24-
args: ''
21+
- platform: 'ubuntu-latest'
22+
args: 'NO_STRIP=1'
23+
- platform: 'ubuntu-24.04-arm'
24+
args: 'NO_STRIP=1'
2525
- platform: 'windows-latest'
2626
args: ''
2727

@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v5
3131

3232
- name: install dependencies (ubuntu only)
33-
if: startsWith(matrix.platform, 'ubuntu-22.04')
33+
if: startsWith(matrix.platform, 'ubuntu')
3434
run: |
3535
sudo apt-get update
3636
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
args: '--target aarch64-apple-darwin'
3333
- platform: 'macos-latest'
3434
args: '--target x86_64-apple-darwin'
35-
- platform: 'ubuntu-22.04'
36-
args: ''
37-
- platform: 'ubuntu-22.04-arm'
38-
args: ''
35+
- platform: 'ubuntu-latest'
36+
args: 'NO_STRIP=1'
37+
- platform: 'ubuntu-24.04-arm'
38+
args: 'NO_STRIP=1'
3939
- platform: 'windows-latest'
4040
args: ''
4141

@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/checkout@v5
4545

4646
- name: install dependencies (ubuntu only)
47-
if: startsWith(matrix.platform, 'ubuntu-22.04')
47+
if: startsWith(matrix.platform, 'ubuntu')
4848
run: |
4949
sudo apt-get update
5050
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818
"@fontsource/roboto": "^5.2.8",
1919
"@mui/icons-material": "^7.3.5",
2020
"@mui/material": "^7.3.5",
21-
"@mui/x-data-grid": "^8.17.0",
21+
"@mui/x-data-grid": "^8.18.0",
2222
"@tauri-apps/api": "^2.9.0",
2323
"@tauri-apps/plugin-dialog": "^2.4.2",
2424
"@tauri-apps/plugin-os": "^2.3.2",
2525
"react": "^19.2.0",
2626
"react-dom": "^19.2.0",
27-
"react-router-dom": "^7.9.5"
27+
"react-router-dom": "^7.9.6"
2828
},
2929
"devDependencies": {
3030
"@eslint/js": "^9.39.1",
3131
"@tauri-apps/cli": "^2.9.4",
32-
"@types/react": "^19.2.2",
33-
"@types/react-dom": "^19.2.2",
34-
"@vitejs/plugin-react": "^5.1.0",
32+
"@types/react": "^19.2.5",
33+
"@types/react-dom": "^19.2.3",
34+
"@vitejs/plugin-react": "^5.1.1",
3535
"eslint": "^9.39.1",
3636
"eslint-config-react-app": "^7.0.1",
3737
"eslint-plugin-import": "^2.32.0",

src-tauri/Cargo.lock

Lines changed: 67 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ rust-version = "1.91.0"
1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

1414
[build-dependencies]
15-
tauri-build = { version = "2.5.1", features = [] }
15+
tauri-build = { version = "2.5.2", features = [] }
1616

1717
[dependencies]
1818
serde_json = "1.0"
1919
serde = { version = "1.0", features = ["derive"] }
20-
tauri = { version = "2.9.2", features = [] }
20+
tauri = { version = "2.9.3", features = [] }
2121
open = "5.3.2"
2222
chrono = "0.4.42"
2323
tauri-plugin-dialog = "2.4.2"

src-tauri/src/main.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ fn main() {
2323
// Fix for NVIDIA
2424
#[cfg(target_os = "linux")]
2525
unsafe {
26-
std::env::set_var("__GL_THREADED_OPTIMIZATIONS", "0");
27-
std::env::set_var("__NV_DISABLE_EXPLICIT_SYNC", "1");
28-
std::env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
26+
std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
2927
}
3028

3129
let shared_state = SharedState {

src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"windows": [
5151
{
5252
"fullscreen": false,
53-
"height": 780,
53+
"height": 880,
5454
"resizable": true,
5555
"title": "Advanced PortChecker",
5656
"width": 1200

0 commit comments

Comments
 (0)