diff options
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | backend/decky_loader/updater.py | 2 | ||||
| -rw-r--r-- | backend/pyinstaller.spec | 3 | ||||
| -rw-r--r-- | frontend/src/components/settings/pages/general/index.tsx | 3 | ||||
| -rw-r--r-- | frontend/src/updater.ts | 1 |
5 files changed, 9 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6a56f39..93f0f783 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: working-directory: ./backend run: | poetry dynamic-versioning - DECKY_REPO="${{ github.repository }}" DECKY_BRANCH="${{ github.event.number && format('PR{0}/{1}', github.event.number, github.head_ref) || github.ref_name }}" ${{ inputs.noconsole == true && 'DECKY_NOCONSOLE=1 ' || '' }}pyinstaller pyinstaller.spec + DECKY_REPO="${{ github.repository }}" DECKY_BRANCH="${{ github.event.number && github.head_ref || github.ref_name }}" DECKY_PR="${{ github.event.number }}" ${{ inputs.noconsole == true && 'DECKY_NOCONSOLE=1 ' || '' }}pyinstaller pyinstaller.spec echo Builds: ls ./dist diff --git a/backend/decky_loader/updater.py b/backend/decky_loader/updater.py index d018b4fe..cefa6b11 100644 --- a/backend/decky_loader/updater.py +++ b/backend/decky_loader/updater.py @@ -44,6 +44,7 @@ class Updater: self.isSupported: bool = ON_LINUX self.repo = getenv('DECKY_REPO', 'SteamDeckHomebrew/decky-loader') self.git_branch = getenv('DECKY_BRANCH', 'dirty') + self.git_pr = getenv('DECKY_PR', None) try: self.currentBranch = self.get_branch(self.context.settings) @@ -98,6 +99,7 @@ class Updater: "current": self.localVer, "repo": self.repo, "gitBranch": self.git_branch, + "gitPR": self.git_pr, "remote": self.remoteVer, "all": self.allRemoteVers, "updatable": self.localVer != "unknown" and self.localVer != "dev", diff --git a/backend/pyinstaller.spec b/backend/pyinstaller.spec index 3ef888f5..005d3319 100644 --- a/backend/pyinstaller.spec +++ b/backend/pyinstaller.spec @@ -7,6 +7,7 @@ noconsole_str = os.getenv('DECKY_NOCONSOLE', '0') noconsole = bool(noconsole_str) repo = os.getenv('DECKY_REPO', 'SteamDeckHomebrew/decky-loader') branch = os.getenv('DECKY_BRANCH', 'main') +pr = os.getenv('DECKY_PR', None) with open('build_config.py', 'w') as f: f.write(f""" import os @@ -15,6 +16,8 @@ os.environ['DECKY_PACKAGED_BUILD'] = '1' # Build info os.environ['DECKY_REPO'] = {repr(repo)} os.environ['DECKY_BRANCH'] = {repr(branch)} +if pr is not None: + os.environ['DECKY_PR'] = {repr(pr)} # Windows-specific os.environ['DECKY_NOCONSOLE'] = {repr(noconsole_str)} diff --git a/frontend/src/components/settings/pages/general/index.tsx b/frontend/src/components/settings/pages/general/index.tsx index 401da1d2..215d392c 100644 --- a/frontend/src/components/settings/pages/general/index.tsx +++ b/frontend/src/components/settings/pages/general/index.tsx @@ -58,7 +58,8 @@ export default function GeneralSettings({ <DialogControlsSectionHeader>{t('SettingsGeneralIndex.about.header')}</DialogControlsSectionHeader> <Field label={t('SettingsGeneralIndex.about.decky_version')} focusable={true}> <div style={{ color: 'var(--gpSystemLighterGrey)' }}> - {versionInfo?.current} ({versionInfo?.repo}#{versionInfo?.gitBranch}) + {versionInfo?.current} ({versionInfo?.repo}#{versionInfo?.gitBranch} + {versionInfo?.gitPR ? ` (#${versionInfo.gitPR})` : ''}) </div> </Field> </DialogControlsSection> diff --git a/frontend/src/updater.ts b/frontend/src/updater.ts index c4b9034f..ba81ffb8 100644 --- a/frontend/src/updater.ts +++ b/frontend/src/updater.ts @@ -20,6 +20,7 @@ export interface VerInfo { current: string; repo: string; gitBranch: string; + gitPR: string | null; remote: RemoteVerInfo | null; all: RemoteVerInfo[] | null; updatable: boolean; |