From 1f6ca224eafd6ea16ee03e011e1a4ef88ba328d8 Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Fri, 9 Aug 2024 11:20:06 -0500 Subject: [PATCH] Script issues --- .github/workflows/build.yaml | 4 ++-- scripts/build_mac_app.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cf60bf44..052dd9fd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -24,7 +24,7 @@ jobs: mkdir dist echo "::set-env name=VERSION::$(python scripts/get_version.py)" echo "::set-env name=ARCH::$(python scripts/get_arch.py)" - echo "Building branch ${{env.GITHUB_REF}} - version ${{env.VERSION}} - on ${{env.ARCH}}" + echo "Building branch ${{ env.GITHUB_REF }} - version ${{ env.VERSION }} - on ${{ env.ARCH }}" env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true @@ -68,7 +68,7 @@ jobs: - name: Build Mac App if : ${{ startsWith(matrix.os, 'macos') }} - run: python scripts/build_mac_app.py "${{ matrix.os }}" + run: python scripts/build_mac_app.py ${{ matrix.os }} - name: Upload Mac App artifact if : ${{ startsWith(matrix.os, 'macos') }} diff --git a/scripts/build_mac_app.py b/scripts/build_mac_app.py index 6d96d2d4..ade7b6ab 100644 --- a/scripts/build_mac_app.py +++ b/scripts/build_mac_app.py @@ -21,8 +21,12 @@ resources_folder = content_folder / "Resources" resources_folder.mkdir(exist_ok=True) -mac_version = f"{sys.argv[1].split(" - ")[1]}.0" -assert mac_version in ("12.0", "13.0", "14.0", "15.0") +try: + mac_version = f"{sys.argv[1].split(" - ")[1]}.0" + assert mac_version in ("12.0", "13.0", "14.0", "15.0") +except Exception: + print(f"Did not get expected input, received: {sys.argv}") + sys.exit(1) with open(plist_template) as in_file, open(content_folder / "Info.plist", "w") as out_file: template = in_file.read().format(version=__version__, mac_version=mac_version)