mirror of
https://github.com/Cyrix126/gupaxx.git
synced 2024-12-22 22:59:27 +00:00
fix: add dev branch to workflows
This commit is contained in:
parent
8a8904083e
commit
574a67dd4e
3 changed files with 14 additions and 4 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -2,7 +2,7 @@ name: CI
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "main" ]
|
branches: [ "main", "dev" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ "main" ]
|
branches: [ "main" ]
|
||||||
|
|
||||||
|
|
2
.github/workflows/typo.yml
vendored
2
.github/workflows/typo.yml
vendored
|
@ -4,7 +4,7 @@ name: Typo
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "main" ]
|
branches: [ "main", "dev" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ "main" ]
|
branches: [ "main" ]
|
||||||
|
|
||||||
|
|
|
@ -83,8 +83,13 @@ pub(crate) fn calcul_donated_time(
|
||||||
default_spared_time
|
default_spared_time
|
||||||
},
|
},
|
||||||
RuntimeMode::ManuallyDonate => {
|
RuntimeMode::ManuallyDonate => {
|
||||||
let donate_hr = lock!(gui_api_xvb).stats_priv.runtime_manual_amount;
|
let mut donate_hr = lock!(gui_api_xvb).stats_priv.runtime_manual_amount;
|
||||||
info!("RuntimeMode::ManuallyDonate - lhr:{lhr} donate_hr:{donate_hr}");
|
info!("RuntimeMode::ManuallyDonate - lhr:{lhr} donate_hr:{donate_hr}");
|
||||||
|
|
||||||
|
if donate_hr > (lhr as u64) {
|
||||||
|
donate_hr = lhr as u64;
|
||||||
|
}
|
||||||
|
|
||||||
if lhr < 1.0 {
|
if lhr < 1.0 {
|
||||||
default_spared_time
|
default_spared_time
|
||||||
} else {
|
} else {
|
||||||
|
@ -92,8 +97,13 @@ pub(crate) fn calcul_donated_time(
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
RuntimeMode::ManuallyKeep => {
|
RuntimeMode::ManuallyKeep => {
|
||||||
let keep_hr = lock!(gui_api_xvb).stats_priv.runtime_manual_amount;
|
let mut keep_hr = lock!(gui_api_xvb).stats_priv.runtime_manual_amount;
|
||||||
info!("RuntimeMode::ManuallyDonate - lhr:{lhr} keep_hr:{keep_hr}");
|
info!("RuntimeMode::ManuallyDonate - lhr:{lhr} keep_hr:{keep_hr}");
|
||||||
|
|
||||||
|
if keep_hr > (lhr as u64) {
|
||||||
|
keep_hr = lhr as u64;
|
||||||
|
}
|
||||||
|
|
||||||
if lhr < 1.0 {
|
if lhr < 1.0 {
|
||||||
default_spared_time
|
default_spared_time
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue