From a228c4b32ab20c377adf990b808c215c387c3f34 Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu, 1 Dec 2022 11:49:41 -0700 Subject: [PATCH] Squashed commit of the following: commit a1f358b6f0a193be7d3d72fa4082fa09701ebe16 Author: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu Dec 1 11:48:38 2022 -0700 fix: reneable the res of the build Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> commit 8ed02b09aeb9c302e30023fcbf73c8b5e3bbc8ff Author: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu Dec 1 11:41:19 2022 -0700 fix: install qt for tools Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> commit d68dc29d49f1a2547912fc97867126f4fc6d96c4 Author: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu Dec 1 11:32:07 2022 -0700 fix: add tex-gyre to texlive install Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> commit ff654a2a914cd00c867088baf147f8ccd70a185c Author: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu Dec 1 11:08:46 2022 -0700 fix: add required latex pkgs Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> commit 1a4babc11c274f69c6c04edddfc5011f9162759e Author: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu Dec 1 10:17:31 2022 -0700 fix: install sphinx via pip3 Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> commit 4b602b0955fabc2b5067bae46c3408dab0f0dd72 Author: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu Dec 1 10:05:46 2022 -0700 fix: ensure sphinx is properly installed Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> commit 59ad26f434d6c5391c2448724aa44587c2cf7a46 Author: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu Dec 1 09:59:40 2022 -0700 feat: install scheme-basic texlive pkg run setup.py in proper dir Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> commit 16cd50307fbd4519fd6ebdc719e78e99eb37d02b Author: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu Dec 1 09:54:42 2022 -0700 feat: build manual, translations, and sample project zip Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> --- .github/workflows/build.yml | 61 ++++++++++++++++++++++++++++--------- macos/build.sh | 9 ++++-- 2 files changed, 53 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6c1dd2c..0d4e17b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: tags: - '*' branches: - - 'macos-appbundle' + - 'macos-docs-build' jobs: build: @@ -15,6 +15,12 @@ jobs: include: - os: macos-12 name: macos + qt_ver: 5 + qt_host: mac + qt_version: '5.15.2' + qt_modules: '' + qt_tools: '' + runs-on: ${{ matrix.os }} steps: @@ -33,12 +39,37 @@ jobs: ver_novelwriter=`awk '/^__version__/{print substr($NF,2,length($NF)-2)}' novelwriter/__init__.py` echo "VERSION=$ver_novelwriter" >> $GITHUB_ENV echo "VERSION_SHORT=$ver_short" >> $GITHUB_ENV + + - name: Install Qt (Linux) + if: runner.os == 'Linux' && matrix.qt_ver != 6 + run: | + sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 + + - name: Install Qt (macOS, AppImage & Windows MSVC) + if: runner.os == 'Linux' && matrix.qt_ver == 6 || runner.os == 'macOS' || (runner.os == 'Windows' && matrix.msystem == '') + uses: jurplel/install-qt-action@v3 + with: + version: ${{ matrix.qt_version }} + host: ${{ matrix.qt_host }} + target: 'desktop' + arch: ${{ matrix.qt_arch }} + modules: ${{ matrix.qt_modules }} + tools: ${{ matrix.qt_tools }} + cache: true + + - name: Setup TeX Live + uses: teatimeguest/setup-texlive-action@v2 + with: + packages: >- + scheme-basic + collection-latexextra + latexmk + tex-gyre - name: Install Dependencies (macOS) if: runner.os == 'macOS' run: | - brew update - brew install create-dmg + pip3 install sphinx ## # BUILD @@ -53,16 +84,16 @@ jobs: # UPLOAD BUILDS ## - - name: Upload binary zip (macOS) - if: runner.os == 'macOS' - uses: actions/upload-artifact@v3 - with: - name: novelWriter-${{ matrix.name }}-${{ env.VERSION }}.app.zip - path: novelWriter.app.zip + # - name: Upload binary zip (macOS) + # if: runner.os == 'macOS' + # uses: actions/upload-artifact@v3 + # with: + # name: novelWriter-${{ matrix.name }}-${{ env.VERSION }}.app.zip + # path: novelWriter.app.zip - - name: Upload dmg (macOS) - if: runner.os == 'macOS' - uses: actions/upload-artifact@v3 - with: - name: novelWriter-${{ matrix.name }}-${{ env.VERSION }}.dmg - path: novelWriter-${{ env.VERSION }}.dmg + # - name: Upload dmg (macOS) + # if: runner.os == 'macOS' + # uses: actions/upload-artifact@v3 + # with: + # name: novelWriter-${{ matrix.name }}-${{ env.VERSION }}.dmg + # path: novelWriter-${{ env.VERSION }}.dmg diff --git a/macos/build.sh b/macos/build.sh index 79acc276..4faa875e 100755 --- a/macos/build.sh +++ b/macos/build.sh @@ -25,6 +25,13 @@ OLD_CWD="$(pwd)" VERSION="$(awk '/^__version__/{print substr($NF,2,length($NF)-2)}' $SCRIPT_DIR/../novelwriter/__init__.py)" +pushd "$SCRIPT_DIR/../" || exit 1 + +python3 setup.py manual qtlrelease sample + +ls -lah . + +popd || exit 1 pushd "$BUILD_DIR"/ || exit 1 @@ -115,8 +122,6 @@ popd || exit 1 echo "Packageing App ..." - - # generate .dmg brew install create-dmg