From b27589d3d605fdbacaaf2ce2b9309a2a500aaa48 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 27 Jan 2024 16:03:26 +0100 Subject: [PATCH 1/4] Update the help info on Launchpad packages --- docs/source/int_started.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/int_started.rst b/docs/source/int_started.rst index eec91d14..e83c0a42 100644 --- a/docs/source/int_started.rst +++ b/docs/source/int_started.rst @@ -82,7 +82,7 @@ Instead, run the following commands to add the repository and key: .. code-block:: bash sudo gpg --no-default-keyring --keyring /usr/share/keyrings/novelwriter-ppa-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F19F1FCE50043114 - echo "deb [signed-by=/usr/share/keyrings/novelwriter-ppa-keyring.gpg] http://ppa.launchpad.net/vkbo/novelwriter/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/novelwriter.list + echo "deb [signed-by=/usr/share/keyrings/novelwriter-ppa-keyring.gpg] http://ppa.launchpad.net/vkbo/novelwriter/ubuntu noble main" | sudo tee /etc/apt/sources.list.d/novelwriter.list Then run the update and install commands as for Ubuntu: From 3ba345acc8cd26b25f7dd75a3d0a28bbee7afb5b Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 27 Jan 2024 16:03:34 +0100 Subject: [PATCH 2/4] Update GitHub actions --- .github/workflows/build.yml | 16 ++++++++-------- .github/workflows/syntax.yml | 4 ++-- .github/workflows/test_linux.yml | 4 ++-- .github/workflows/test_mac.yml | 4 ++-- .github/workflows/test_win.yml | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9abf2ff6..5e18adea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Python Setup - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" architecture: x64 @@ -18,7 +18,7 @@ jobs: sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Packages (pip) run: pip install -r docs/source/requirements.txt @@ -27,7 +27,7 @@ jobs: run: python pkgutils.py qtlrelease sample manual - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: nw-assets path: | @@ -46,7 +46,7 @@ jobs: linux-tag: ["manylinux_2_24_x86_64", "manylinux_2_28_x86_64"] steps: - name: Python Setup - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" architecture: x64 @@ -55,7 +55,7 @@ jobs: run: pip install python-appimage - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Artifacts uses: actions/download-artifact@v3 @@ -67,7 +67,7 @@ jobs: run: python pkgutils.py build-appimage --linux-tag ${{ matrix.linux-tag }} --python-version ${{ matrix.python-version }} - name: Upload Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: novelWriter-Packages path: | @@ -81,7 +81,7 @@ jobs: runs-on: macos-12 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Artifacts uses: actions/download-artifact@v3 @@ -93,7 +93,7 @@ jobs: run: ./setup/macos/build.sh - name: Upload DMG - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: novelWriter-Packages path: | diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index 01e4e8ea..74085540 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -15,12 +15,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Python Setup - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3 architecture: x64 - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install flake8 run: pip install flake8 - name: Syntax Check diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 3df8da9a..acaf7566 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Python Setup - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} architecture: x64 @@ -27,7 +27,7 @@ jobs: sudo apt update sudo apt install libenchant-2-dev qttools5-dev-tools aspell-en - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Dependencies (pip) run: | pip install -U -r requirements.txt -r tests/requirements.txt diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index 64ef3283..2c63d359 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -15,7 +15,7 @@ jobs: runs-on: macos-latest steps: - name: Python Setup - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" architecture: x64 @@ -23,7 +23,7 @@ jobs: run: | brew install enchant - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Dependencies (pip) run: | pip install -U pyobjc -r requirements.txt -r tests/requirements.txt diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index 1ba30b3a..d9c30718 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -15,12 +15,12 @@ jobs: runs-on: windows-latest steps: - name: Python Setup - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" architecture: x64 - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Dependencies (pip) run: | pip install -U -r requirements.txt -r tests/requirements.txt From 6a30ce5fe361b2fef869963187532177cb8e97a4 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 27 Jan 2024 16:08:12 +0100 Subject: [PATCH 3/4] Update artifacts download action --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e18adea..079319f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: uses: actions/checkout@v4 - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: nw-assets path: novelwriter/assets @@ -84,7 +84,7 @@ jobs: uses: actions/checkout@v4 - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: nw-assets path: novelwriter/assets From c0a5d257acbbcb321f845c95e52160d0e6facc99 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sat, 27 Jan 2024 16:17:20 +0100 Subject: [PATCH 4/4] Fix package name issue with upload artifact version 4 --- .github/workflows/build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 079319f9..492bb5f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,10 +69,8 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: novelWriter-Packages - path: | - dist_appimage/novelWriter*.AppImage - dist_appimage/novelWriter*.AppImage.sha256 + name: AppImage-${{ matrix.python-version }}-${{ matrix.linux-tag }} + path: dist_appimage if-no-files-found: error retention-days: 1 @@ -95,9 +93,7 @@ jobs: - name: Upload DMG uses: actions/upload-artifact@v4 with: - name: novelWriter-Packages - path: | - dist_macos/novelWriter*.dmg - dist_macos/novelWriter*.dmg.sha256 + name: MacOS-DMG + path: dist_macos if-no-files-found: error retention-days: 1