Added Custom Path case when saving screenshots (#5086 )

actions: revert timeout-minutes changes for PR workflow
Varibales aren't exposed to PRs...
2023-05-28 22:44:46 +02:00 · 2023-05-28 11:34:57 +02:00 · 2023-05-28 08:10:43 +02:00
6 changed files with 8 additions and 8 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -27,7 +27,7 @@ jobs:
  build:
    name: ${{ matrix.OS_NAME }} (${{ matrix.configuration }})
    runs-on: ${{ matrix.os }}
-    timeout-minutes: ${{ vars.JOB_TIMEOUT }}
+    timeout-minutes: 45
    strategy:
      matrix:
        os: [ubuntu-latest, macOS-latest, windows-latest]
@ -110,7 +110,7 @@ jobs:
  build_macos:
    name: macOS Universal (${{ matrix.configuration }})
    runs-on: ubuntu-latest
-    timeout-minutes: ${{ vars.JOB_TIMEOUT }}
+    timeout-minutes: 45
    strategy:
      matrix:
        configuration: [ Debug, Release ]
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@ -12,7 +12,7 @@ concurrency: flatpak-release

 jobs:
  release:
-    timeout-minutes: ${{ vars.JOB_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
    runs-on: ubuntu-latest

    env:
--- a/.github/workflows/nightly_pr_comment.yml
+++ b/.github/workflows/nightly_pr_comment.yml
@ -7,7 +7,7 @@ jobs:
  pr_comment:
    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
    runs-on: ubuntu-latest
-    timeout-minutes: ${{ vars.JOB_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
    steps:
      - uses: actions/github-script@v6
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -46,7 +46,7 @@ jobs:
  release:
    name: Release ${{ matrix.OS_NAME }}
    runs-on: ${{ matrix.os }}
-    timeout-minutes: ${{ vars.JOB_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
    strategy:
      matrix:
        os: [ ubuntu-latest, windows-latest ]
@ -144,7 +144,7 @@ jobs:
  macos_release:
    name: Release MacOS universal
    runs-on: ubuntu-latest
-    timeout-minutes: ${{ vars.JOB_TIMEOUT }}
+    timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT) }}
    steps:
      - uses: actions/checkout@v3

--- a/src/Ryujinx.Ava/AppHost.cs
+++ b/src/Ryujinx.Ava/AppHost.cs
@ -270,7 +270,7 @@ namespace Ryujinx.Ava

                        string directory = AppDataManager.Mode switch
                        {
-                            AppDataManager.LaunchMode.Portable => Path.Combine(AppDataManager.BaseDirPath, "screenshots"),
+                            AppDataManager.LaunchMode.Portable or AppDataManager.LaunchMode.Custom => Path.Combine(AppDataManager.BaseDirPath, "screenshots"),
                            _                                  => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "Ryujinx")
                        };

--- a/src/Ryujinx/Ui/RendererWidgetBase.cs
+++ b/src/Ryujinx/Ui/RendererWidgetBase.cs
@ -381,7 +381,7 @@ namespace Ryujinx.Ui
                        string filename    = $"ryujinx_capture_{currentTime.Year}-{currentTime.Month:D2}-{currentTime.Day:D2}_{currentTime.Hour:D2}-{currentTime.Minute:D2}-{currentTime.Second:D2}.png";
                        string directory   = AppDataManager.Mode switch
                        {
-                            AppDataManager.LaunchMode.Portable => System.IO.Path.Combine(AppDataManager.BaseDirPath, "screenshots"),
+                            AppDataManager.LaunchMode.Portable or AppDataManager.LaunchMode.Custom => System.IO.Path.Combine(AppDataManager.BaseDirPath, "screenshots"),
                            _ => System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "Ryujinx")
                        };
Author	SHA1	Message	Date
Daniel Shala	378080eb87	Added Custom Path case when saving screenshots (#5086 )	2023-05-28 22:44:46 +02:00
Mary	e8f5e97fa4	actions: revert timeout-minutes changes for PR workflow Varibales aren't exposed to PRs...	2023-05-28 11:34:57 +02:00
Mary	f3873620a3	actions: Workaround YAML limitation for timeout-minutes Because Github Actions wants an int, we use fromJSON to hack around this.	2023-05-28 08:10:43 +02:00