Skip to content

Commit

Permalink
Prepend the PR version number with PR- to make it clearer that's the …
Browse files Browse the repository at this point in the history
…PR number.
  • Loading branch information
RodoMa92 committed Feb 4, 2024
1 parent 931304c commit 8b91d71
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion backend/updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ async def download_testing_version(self, pr_id, sha_id):
async with web.request("GET", "https://api.github.com/repos/SteamDeckHomebrew/decky-loader/actions/artifacts", params={'per_page':'30', 'page': i}, ssl=helpers.get_ssl_context()) as res:
res = handle_response_from_artifact_api(await res.json(), sha_id)
if res != '':
self.download_decky_binary(url, res, pr_id, true)
self.download_decky_binary(url, res, 'PR-' + pr_id, true)
#We should never exit out from the inner loop if the call is correct (we should find the associated binary and exit before ending here). Log an error.
logger.error("Couldn't find the requested artifact id, this shouldn't happen normally!")

Expand Down
13 changes: 8 additions & 5 deletions frontend/src/components/DeckyToaster.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,14 @@ const DeckyToaster: FC<DeckyToasterProps> = () => {
// not actually node but TS is shit
let interval: NodeJS.Timer | null;
if (renderedToast) {
interval = setTimeout(() => {
interval = null;
console.log('clear toast', renderedToast.data);
removeToast(renderedToast.data);
}, (renderedToast.data.duration || 5e3) + 1000);
interval = setTimeout(
() => {
interval = null;
console.log('clear toast', renderedToast.data);
removeToast(renderedToast.data);
},
(renderedToast.data.duration || 5e3) + 1000,
);
console.log('set int', interval);
}
return () => {
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/components/settings/pages/general/Updater.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ import { useTranslation } from 'react-i18next';
import { FaExclamation } from 'react-icons/fa';

import { VerInfo, callUpdaterMethod, finishUpdate } from '../../../../updater';
import { useSetting } from '../../../../utils/hooks/useSetting';
import { useDeckyState } from '../../../DeckyState';
import InlinePatchNotes from '../../../patchnotes/InlinePatchNotes';
import WithSuspense from '../../../WithSuspense';

import { useSetting } from '../../../../utils/hooks/useSetting';

const MarkdownRenderer = lazy(() => import('../../../Markdown'));

enum UpdateBranch {
Expand Down Expand Up @@ -144,8 +143,8 @@ export default function UpdaterSettings() {
{checkingForUpdates
? t('Updater.updates.checking')
: !versionInfo?.remote || versionInfo?.remote?.tag_name == versionInfo?.current
? t('Updater.updates.check_button')
: t('Updater.updates.install_button')}
? t('Updater.updates.check_button')
: t('Updater.updates.install_button')}
</DialogButton>
) : (
<ProgressBarWithInfo
Expand Down

0 comments on commit 8b91d71

Please sign in to comment.