Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix builds timed out being correctly displayed

Browse Source 
do not show in changelog
This commit is contained in:
Clément Pasteau
2022-01-31 17:05:00 +01:00
committed by GitHub
parent 7d2ac0da38
commit c5a709fee2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
newIDE/app/src/Export/Builds/BuildProgressAndActions.js
View File

@@ -96,11 +96,11 @@ export default ({
differenceInSeconds(build.updatedAt, Date.now())
);
const estimatedRemainingTime = estimatedTime - secondsSinceLastUpdate;
const isStillRunning = estimatedRemainingTime > 0;
const isStillWithinEstimatedTime = estimatedRemainingTime > 0;
const hasJustOverrun =
estimatedRemainingTime < 0 && estimatedRemainingTime < -estimatedTime;
!isStillWithinEstimatedTime && estimatedRemainingTime >= -estimatedTime;
const hasTimedOut =
estimatedRemainingTime < 0 && estimatedRemainingTime > 2 * -estimatedTime;
!isStillWithinEstimatedTime && estimatedRemainingTime < -estimatedTime;
const onDownload = (key: BuildArtifactKeyName) => {
const url = getBuildArtifactUrl(build, key);
@@ -160,23 +160,25 @@ export default ({
</React.Fragment>
) : build.status === 'pending' ? (
<Line alignItems="center" expand justifyContent="center">
{(isStillRunning || hasJustOverrun) && (
{(isStillWithinEstimatedTime || hasJustOverrun) && (
<>
<LinearProgress
style={{ flex: 1 }}
value={
isStillRunning
isStillWithinEstimatedTime
? ((estimatedTime - estimatedRemainingTime) /
estimatedTime) *
100
: 0
}
variant={isStillRunning ? 'determinate' : 'indeterminate'}
variant={
isStillWithinEstimatedTime ? 'determinate' : 'indeterminate'
}
/>
<Spacer />
</>
)}
{isStillRunning && (
{isStillWithinEstimatedTime && (
<Text>
<Trans>
~{Math.round(estimatedRemainingTime / 60)} minutes.