diff options
| author | a2k-hanlon <andrewkhanlon@gmail.com> | 2021-01-30 00:30:22 +0300 |
|---|---|---|
| committer | a2k-hanlon <andrewkhanlon@gmail.com> | 2021-01-30 00:30:22 +0300 |
| commit | 8c4deef7fced4fae60263bd2896ba513544b7602 (patch) | |
| tree | 334438e182202352d3ac1094a81719638e8d102e /.github | |
| parent | 2d4088aa525fbaa1d7f0f89a8d6eebc88d10557d (diff) | |
Cleaned up github action scripts for macOS
- Only upload the application, ie. exclude extraneous binary
- Put the git commit hash in the app version metadata
- Replace Mac OS X with macOS
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/buildpackage-mac.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/pypi-mac.yml | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/buildpackage-mac.yml b/.github/workflows/buildpackage-mac.yml index 3776ab9..d070cdf 100644 --- a/.github/workflows/buildpackage-mac.yml +++ b/.github/workflows/buildpackage-mac.yml @@ -1,4 +1,4 @@ -name: Build Mac OS X app +name: Build macOS app on: push: @@ -35,10 +35,12 @@ jobs: run: | pyi-makespec --hidden-import="pkg_resources.py2_warn" -F --add-data images/\*:images --add-data \*.png:. --add-data \*.ico:. -w -i P-face.icns pronterface.py # Edit spec file + export git_hash=$(git rev-parse --short "$GITHUB_SHA") sed -i '' '$ s/.$//' pronterface.spec cat >> pronterface.spec <<EOL , info_plist={ + 'CFBundleShortVersionString': '$git_hash', 'NSPrincipalClass': 'NSApplication', 'NSAppleScriptEnabled': False, 'NSAppSleepDisabled': True, @@ -48,13 +50,11 @@ jobs: - name: Make pyinstaller build run: | pyinstaller --clean pronterface.spec -y - ls -l dist/pronterface.app/Contents/macOS/pronterface - chmod +x dist/pronterface.app/Contents/macOS/pronterface - ls -l dist/pronterface.app/Contents/macOS/pronterface - rm dist/pronterface - zip -r -X pronterface-app.zip dist + # Zip app manually to avoid losing execute permissions for binary file in app + cd dist + zip -r -X pronterface-app.zip pronterface.app - name: Upload artifacts for inspection uses: actions/upload-artifact@v2 with: name: macosapp_${{ matrix.os }}_${{ matrix.architecture }}_${{ matrix.python-version }} - path: pronterface-app.zip + path: dist/pronterface-app.zip diff --git a/.github/workflows/pypi-mac.yml b/.github/workflows/pypi-mac.yml index cb551bd..4c3edf9 100644 --- a/.github/workflows/pypi-mac.yml +++ b/.github/workflows/pypi-mac.yml @@ -1,4 +1,4 @@ -name: Build Mac OS X Python package +name: Build macOS Python package on: push: |