Skip to content

Commit

Permalink
Try to get the MacOS build working.
Browse files Browse the repository at this point in the history
  • Loading branch information
badabing2005 committed Mar 4, 2024
1 parent 1f35780 commit 91e2c16
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ jobs:
dist/PixelFlasher_Ubuntu_22_04.sha256
# ---------------------------------------------------------------------------
# build_mac_11
# build_mac_13
# ---------------------------------------------------------------------------
build_mac_13:
if: github.actor == 'badabing2005'
Expand All @@ -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 [email protected]
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build-on-mac.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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')
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion windows-metadata.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions windows-version-info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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])])
]
Expand Down

0 comments on commit 91e2c16

Please sign in to comment.