From 5e985af37b0507209506fa17076533343554cedc Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 4 Apr 2023 19:45:27 +0200 Subject: [PATCH 1/2] Add additional manylinux version to appimage build --- .github/workflows/build.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04b77a26..4adb70e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,9 +37,10 @@ jobs: buildLinux: needs: buildAssets runs-on: ubuntu-latest - env: - LINUX_TAG: "manylinux_2_28_x86_64" - PY_VER: "3.10" + strategy: + matrix: + python-version: ["3.10"] + linux-tag: ["manylinux_2_24_x86_64", "manylinux_2_28_x86_64"] steps: - name: Python Setup uses: actions/setup-python@v4 @@ -67,13 +68,13 @@ jobs: path: novelwriter/assets - name: Build AppImage - run: python setup.py build-appimage --linux-tag ${{ env.LINUX_TAG }} --python-version ${{ env.PY_VER }} + run: python setup.py build-appimage --linux-tag ${{ matrix.linux-tag }} --python-version ${{ matrix.python-version }} - name: Upload Artifacts uses: actions/upload-artifact@v3 with: - name: novelWriter-${{ env.VERSION }}-py${{ env.PY_VER }}-${{ env.LINUX_TAG }}.AppImage - path: dist_appimage/novelWriter-${{ env.VERSION }}-py${{ env.PY_VER }}-${{ env.LINUX_TAG }}.AppImage + name: novelWriter-${{ env.VERSION }}-py${{ matrix.python-version }}-${{ matrix.linux-tag }}.AppImage + path: dist_appimage/novelWriter-${{ env.VERSION }}-py${{ matrix.python-version }}-${{ matrix.linux-tag }}.AppImage if-no-files-found: error retention-days: 1 From 5bb78f3f0d82231cf808df035f4d446808f07cb2 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 4 Apr 2023 19:51:02 +0200 Subject: [PATCH 2/2] Use pip for build dependencies for assets --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4adb70e8..e5dbfc8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,11 +15,14 @@ jobs: - name: Install Packages (apt) run: | sudo apt update - sudo apt install qttools5-dev-tools python3-sphinx latexmk texlive texlive-latex-extra + sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra - name: Checkout Source uses: actions/checkout@v3 + - name: Install Packages (pip) + run: pip install -r docs/source/requirements.txt + - name: Build Assets run: python setup.py qtlrelease sample manual