mirror of
https://github.com/zhom/donutbrowser.git
synced 2026-06-28 01:19:58 +02:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8980056e44 | |||
| 885c6a1446 | |||
| a67803dbc8 |
@@ -6,6 +6,8 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
tags:
|
||||||
|
- "v*"
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- "src-tauri/**"
|
- "src-tauri/**"
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
tags:
|
||||||
|
- "v*"
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- "src/**"
|
- "src/**"
|
||||||
|
|||||||
@@ -10,28 +10,7 @@ env:
|
|||||||
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
|
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# Wait for linting jobs to complete first
|
|
||||||
wait-for-linting:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Wait for Rust linting to complete
|
|
||||||
uses: lewagon/wait-on-check-action@v1.3.4
|
|
||||||
with:
|
|
||||||
ref: ${{ github.ref }}
|
|
||||||
check-name: "Lint Rust"
|
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
wait-interval: 10
|
|
||||||
|
|
||||||
- name: Wait for JavaScript linting to complete
|
|
||||||
uses: lewagon/wait-on-check-action@v1.3.4
|
|
||||||
with:
|
|
||||||
ref: ${{ github.ref }}
|
|
||||||
check-name: "Lint Node.js"
|
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
wait-interval: 10
|
|
||||||
|
|
||||||
release:
|
release:
|
||||||
needs: wait-for-linting
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
strategy:
|
strategy:
|
||||||
|
|||||||
@@ -33,9 +33,11 @@ lazy_static = "1.4"
|
|||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
zip = "4"
|
zip = "4"
|
||||||
async-trait = "0.1"
|
async-trait = "0.1"
|
||||||
core-foundation="0.10"
|
|
||||||
futures-util = "0.3"
|
futures-util = "0.3"
|
||||||
|
|
||||||
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
|
core-foundation="0.10"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = "3.13.0"
|
tempfile = "3.13.0"
|
||||||
tokio-test = "0.4.4"
|
tokio-test = "0.4.4"
|
||||||
|
|||||||
@@ -83,6 +83,8 @@ impl BrowserRunner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Helper function to validate PID for TOR/Mullvad browsers
|
// Helper function to validate PID for TOR/Mullvad browsers
|
||||||
|
// TODO: make available for other platforms once other functionality is implemented
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
fn validate_tor_mullvad_pid(&self, profile: &BrowserProfile, pid: u32) -> bool {
|
fn validate_tor_mullvad_pid(&self, profile: &BrowserProfile, pid: u32) -> bool {
|
||||||
let system = System::new_all();
|
let system = System::new_all();
|
||||||
|
|
||||||
@@ -134,6 +136,7 @@ impl BrowserRunner {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_binaries_dir(&self) -> PathBuf {
|
pub fn get_binaries_dir(&self) -> PathBuf {
|
||||||
let mut path = self.base_dirs.data_local_dir().to_path_buf();
|
let mut path = self.base_dirs.data_local_dir().to_path_buf();
|
||||||
path.push(if cfg!(debug_assertions) {
|
path.push(if cfg!(debug_assertions) {
|
||||||
|
|||||||
Reference in New Issue
Block a user