From 05f8435e09d70f45fa5382a8bc4de1d8a0b24921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 28 May 2024 22:17:53 +0200 Subject: [PATCH] [workflows:executables] restore 'gallery-dl_ubuntu' name --- .github/workflows/executables.yml | 2 +- scripts/pyinstaller.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/executables.yml b/.github/workflows/executables.yml index ac88e3e02c..ffeff7ff14 100644 --- a/.github/workflows/executables.yml +++ b/.github/workflows/executables.yml @@ -68,7 +68,7 @@ jobs: - name: Build executable run: | pip install requests requests[socks] yt-dlp pyyaml ${{ matrix.python-packages }} pyinstaller - python ./scripts/pyinstaller.py --label '${{ env.LABEL }}' + python ./scripts/pyinstaller.py --os '${{ matrix.os }}' --arch '${{ matrix.architecture }}' - uses: actions/upload-artifact@v4 with: diff --git a/scripts/pyinstaller.py b/scripts/pyinstaller.py index 58303547a3..16d47ba937 100755 --- a/scripts/pyinstaller.py +++ b/scripts/pyinstaller.py @@ -22,15 +22,12 @@ def main(): else: label = "" if args.os: - os = args.os.partition("-")[0].lower() - if os == "ubuntu": - os = "linux" - label += os + label += args.os.partition("-")[0].lower() if args.arch == "x86": label += "_x86" if args.print: - return print(label) + return print(label.replace("ubuntu", "linux")) name = "gallery-dl" if label: