From 8b9332e15004640710080727ae12aab2d46cdcf7 Mon Sep 17 00:00:00 2001 From: Timmy Welch Date: Tue, 21 Feb 2023 20:00:47 -0800 Subject: [PATCH] Fix linux build --- .github/workflows/build.yaml | 3 +-- .github/workflows/package.yaml | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 337661e..dcd6901 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -89,7 +89,7 @@ jobs: if: runner.os == 'macOS' - name: Install linux dependencies run: | - sudo apt-get install pkg-config libicu-dev + sudo apt-get install pkg-config libicu-dev libqt5gui5 export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" python -m pip install --no-binary=pyicu pyicu @@ -106,7 +106,6 @@ jobs: - name: Archive production artifacts uses: actions/upload-artifact@v2 - if: runner.os != 'Linux' # linux binary currently has a segfault when running on latest fedora with: name: "${{ format('ComicTagger-{0}', runner.os) }}" path: | diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index eb37ecd..b7c73f0 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -50,7 +50,7 @@ jobs: if: runner.os == 'macOS' - name: Install linux dependencies run: | - sudo apt-get install pkg-config libicu-dev + sudo apt-get install pkg-config libicu-dev libqt5gui5 export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" python -m pip install --no-binary=pyicu pyicu @@ -88,6 +88,7 @@ jobs: name: "${{ env.release_name }}" prerelease: "${{ contains(github.ref, '-') }}" # alpha-releases should be 1.3.0-alpha.x full releases should be 1.3.0 draft: false + # upload the single application zip file for each OS and include the wheel built on linux files: | - dist/!(*Linux).zip + dist/*.zip dist/*${{ fromJSON('["never", ""]')[runner.os == 'Linux'] }}.whl