From 91e2c165d5fabec354275bc7bcee2f124d7ab830 Mon Sep 17 00:00:00 2001 From: Bing Date: Sun, 3 Mar 2024 22:42:34 -0500 Subject: [PATCH] Try to get the MacOS build working. --- .github/workflows/main.yml | 14 +++++++------- build-on-mac.spec | 2 +- build.sh | 2 +- constants.py | 2 +- windows-metadata.yaml | 2 +- windows-version-info.txt | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1417b92..a5a30fd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -271,7 +271,7 @@ jobs: dist/PixelFlasher_Ubuntu_22_04.sha256 # --------------------------------------------------------------------------- - # build_mac_11 + # build_mac_13 # --------------------------------------------------------------------------- build_mac_13: if: github.actor == 'badabing2005' @@ -286,17 +286,17 @@ jobs: run: | ls /usr/local/Cellar - - name: Set up Python 3.12 - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - name: Install node graphicsmagick imagemagick run: brew install node graphicsmagick imagemagick - name: Install create-dmg run: npm install --global create-dmg + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: '3.12' + # - name: Uninstall Pythons other than 3.11 # run: | # brew uninstall --ignore-dependencies python@3.10 @@ -349,7 +349,7 @@ jobs: # --------------------------------------------------------------------------- deploy: if: github.actor == 'badabing2005' - needs: [build_windows, build_windows_2019, build_ubuntu_20_04, build_ubuntu_22_04, build_mac_13] + needs: [build_windows, build_windows_2019, build_ubuntu_20_04, build_ubuntu_22_04] runs-on: ubuntu-latest diff --git a/build-on-mac.spec b/build-on-mac.spec index 14b3d3f..32d5434 100644 --- a/build-on-mac.spec +++ b/build-on-mac.spec @@ -28,6 +28,6 @@ exe = EXE(pyz, icon='images/icon-dark-256.icns') app = BUNDLE(exe, name='PixelFlasher.app', - version='6.8.2.0', + version='6.8.2.1', icon='./images/icon-dark-256.icns', bundle_identifier='com.badabing.pixelflasher') diff --git a/build.sh b/build.sh index 4861f2e..1d0c57f 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash rm -rf build dist -VERSION=6.8.2.0 +VERSION=6.8.2.1 NAME="PixelFlasher" DIST_NAME="PixelFlasher" diff --git a/constants.py b/constants.py index 00fb2d6..9f9b434 100644 --- a/constants.py +++ b/constants.py @@ -2,7 +2,7 @@ APPNAME = 'PixelFlasher' CONFIG_FILE_NAME = 'PixelFlasher.json' -VERSION = '6.8.2.0' +VERSION = '6.8.2.1' SDKVERSION = '33.0.3' MAIN_WIDTH = 1400 MAIN_HEIGHT = 1040 diff --git a/windows-metadata.yaml b/windows-metadata.yaml index d5a5340..8334944 100644 --- a/windows-metadata.yaml +++ b/windows-metadata.yaml @@ -1,6 +1,6 @@ # https://github.com/DudeNr33/pyinstaller-versionfile # create-version-file windows-metadata.yaml --outfile windows-version-info.txt -Version: 6.8.2.0 +Version: 6.8.2.1 FileDescription: PixelFlasher InternalName: PixelFlasher OriginalFilename: PixelFlasher.exe diff --git a/windows-version-info.txt b/windows-version-info.txt index 3141f52..14ba97c 100644 --- a/windows-version-info.txt +++ b/windows-version-info.txt @@ -7,8 +7,8 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. Must always contain 4 elements. - filevers=(6,8,2,0), - prodvers=(6,8,2,0), + filevers=(6,8,2,1), + prodvers=(6,8,2,1), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, # Contains a bitmask that specifies the Boolean attributes of the file. @@ -32,12 +32,12 @@ VSVersionInfo( u'040904B0', [StringStruct(u'CompanyName', u''), StringStruct(u'FileDescription', u'PixelFlasher'), - StringStruct(u'FileVersion', u'6.8.2.0'), + StringStruct(u'FileVersion', u'6.8.2.1'), StringStruct(u'InternalName', u'PixelFlasher'), StringStruct(u'LegalCopyright', u''), StringStruct(u'OriginalFilename', u'PixelFlasher.exe'), StringStruct(u'ProductName', u'PixelFlasher'), - StringStruct(u'ProductVersion', u'6.8.2.0')]) + StringStruct(u'ProductVersion', u'6.8.2.1')]) ]), VarFileInfo([VarStruct(u'Translation', [1033, 1200])]) ]