Skip to content

Commit

Permalink
Use macOS 13 runner due to pyexiv2 missing wheel for macOS 14
Browse files Browse the repository at this point in the history
  • Loading branch information
JWCook committed Jun 30, 2024
1 parent 93a8664 commit a0bf3fd
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 71 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
required: false
default: ''
publish:
description: 'Set to "false" to skip publishing to PyPI'
description: 'Publish package to PyPI'
required: false
default: 'true'

Expand All @@ -29,7 +29,7 @@ jobs:
build-app-packages:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]
fail-fast: false
defaults:
run:
Expand All @@ -46,7 +46,7 @@ jobs:

# Install binary + python dependencies
- name: Install system packages
if: ${{ matrix.os == 'ubuntu-latest' }}
if: startsWith(matrix.os, 'ubuntu')
run: sudo apt-get install -y '^libxcb.*-dev' libegl-dev libwebp-dev libpng16-16 libx11-xcb-dev rpm
- name: Cache python packages
id: cache
Expand All @@ -65,7 +65,7 @@ jobs:

# Include taxon FTS db, compress, and set platform name
- name: Finish pyinstaller package (Linux)
if: ${{ matrix.os == 'ubuntu-latest' }}
if: startsWith(matrix.os, 'ubuntu')
run: |
ASSETS=dist/naturtag/_internal/assets/data
tar -xvzf $ASSETS/taxonomy.tar.gz --directory $ASSETS/
Expand All @@ -74,7 +74,7 @@ jobs:
echo "DIST_NAME=linux" >> $GITHUB_ENV
- name: Finish pyinstaller package (macOS)
if: ${{ matrix.os == 'macos-latest' }}
if: startsWith(matrix.os, 'macos')
run: |
ASSETS=dist/naturtag.app/Contents/Resources/assets/data
tar -xvzf $ASSETS/taxonomy.tar.gz --directory $ASSETS/
Expand All @@ -83,7 +83,7 @@ jobs:
echo "DIST_NAME=macos" >> $GITHUB_ENV
- name: Finish pyinstaller package (Windows)
if: ${{ matrix.os == 'windows-latest' }}
if: startsWith(matrix.os, 'windows')
run: |
ASSETS=dist/naturtag/_internal/assets/data
tar -xvzf $ASSETS/taxonomy.tar.gz --directory $ASSETS/
Expand All @@ -93,7 +93,7 @@ jobs:
# Build deb, snap, and rpm packages
- name: Build Linux packages with FPM
if : ${{ matrix.os == 'ubuntu-latest' }}
if : startsWith(matrix.os, 'ubuntu')
run: |
export GEM_HOME="$(ruby -e 'puts Gem.user_dir')"
export PATH="$PATH:$GEM_HOME/bin"
Expand All @@ -103,7 +103,7 @@ jobs:
# Build dmg package
- name: Build disk image (macOS)
if: ${{ matrix.os == 'macos-latest' }}
if: startsWith(matrix.os, 'macos')
run: |
brew install create-dmg
cd packaging
Expand All @@ -117,14 +117,14 @@ jobs:
path: naturtag-${{ env.DIST_NAME }}.tar.gz

- name: Upload disk image (macOS)
if: ${{ matrix.os == 'macos-latest' }}
if: startsWith(matrix.os, 'macos')
uses: actions/upload-artifact@v4
with:
name: naturtag.dmg
path: dist/naturtag.dmg

- name: Upload FPM workflow artifacts (Linux)
if : ${{ matrix.os == 'ubuntu-latest' }}
if : startsWith(matrix.os, 'ubuntu')
uses: actions/upload-artifact@v4
with:
name: naturtag-fpm
Expand Down
Loading

0 comments on commit a0bf3fd

Please sign in to comment.