aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary <mary@mary.zone>2023-03-11 20:11:09 +0100
committerMary <mary@mary.zone>2023-03-11 20:11:09 +0100
commit81691b9e3716c7f7f8b243f0f4ded1d90c526a4e (patch)
treeb90d9c4a06d637603b5aef94a9f74081fb1056f6
parent2dc422bc14d5f301108bad14ab732f169bbdc277 (diff)
gha(release): Attempt to fix flathub pusher1.1.656
-rw-r--r--.github/workflows/flatpak.yml9
-rw-r--r--.github/workflows/release.yml3
2 files changed, 4 insertions, 8 deletions
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index a05f5c11..7df99065 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -3,10 +3,7 @@ name: Flatpak release job
on:
workflow_call:
inputs:
- ryujinx_base_version:
- required: true
- type: string
- ryujinx_version_minor:
+ ryujinx_version:
required: true
type: string
@@ -23,7 +20,7 @@ jobs:
GIT_COMMITTER_EMAIL: "61127645+RyujinxBot@users.noreply.github.com"
RYUJINX_PROJECT_FILE: "Ryujinx/Ryujinx.csproj"
NUGET_SOURCES_DESTDIR: "nuget-sources"
- RYUJINX_VERSION: "${{ inputs.ryujinx_base_version }}. ${{ inputs.ryujinx_version_minor }}"
+ RYUJINX_VERSION: "${{ inputs.ryujinx_version }}"
steps:
- uses: actions/checkout@v3
@@ -64,7 +61,7 @@ jobs:
sources = []
- for path in Path((os.environ['NUGET_PACKAGES']).glob('**/*.nupkg.sha512'):
+ for path in Path(os.environ['NUGET_PACKAGES']).glob('**/*.nupkg.sha512'):
name = path.parent.parent.name
version = path.parent.name
filename = '{}.{}.nupkg'.format(name, version)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0f979da1..b2c5e2f0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -116,6 +116,5 @@ jobs:
uses: ./.github/workflows/flatpak.yml
needs: release
with:
- ryujinx_base_version: "1.1"
- ryujinx_version_minor: github.run_number
+ ryujinx_version: "1.1.${{ github.run_number }}"
secrets: inherit