Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some issues after release 2.2.1 (#1672)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-01-27 16:42:56 +01:00
committed by GitHub
parent 5979503dc8 c0a5d257ac
commit 11c4428a8a
6 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+14 -18
View File
@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: "3.11" python-version: "3.11"
architecture: x64 architecture: x64
@@ -18,7 +18,7 @@ jobs:
sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra sudo apt install qttools5-dev-tools latexmk texlive texlive-latex-extra
- name: Checkout Source - name: Checkout Source
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install Packages (pip) - name: Install Packages (pip)
run: pip install -r docs/source/requirements.txt run: pip install -r docs/source/requirements.txt
@@ -27,7 +27,7 @@ jobs:
run: python pkgutils.py qtlrelease sample manual run: python pkgutils.py qtlrelease sample manual
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: nw-assets name: nw-assets
path: | path: |
@@ -46,7 +46,7 @@ jobs:
linux-tag: ["manylinux_2_24_x86_64", "manylinux_2_28_x86_64"] linux-tag: ["manylinux_2_24_x86_64", "manylinux_2_28_x86_64"]
steps: steps:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: "3.11" python-version: "3.11"
architecture: x64 architecture: x64
@@ -55,10 +55,10 @@ jobs:
run: pip install python-appimage run: pip install python-appimage
- name: Checkout Source - name: Checkout Source
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Download Artifacts - name: Download Artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: nw-assets name: nw-assets
path: novelwriter/assets path: novelwriter/assets
@@ -67,12 +67,10 @@ jobs:
run: python pkgutils.py build-appimage --linux-tag ${{ matrix.linux-tag }} --python-version ${{ matrix.python-version }} run: python pkgutils.py build-appimage --linux-tag ${{ matrix.linux-tag }} --python-version ${{ matrix.python-version }}
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: novelWriter-Packages name: AppImage-${{ matrix.python-version }}-${{ matrix.linux-tag }}
path: | path: dist_appimage
dist_appimage/novelWriter*.AppImage
dist_appimage/novelWriter*.AppImage.sha256
if-no-files-found: error if-no-files-found: error
retention-days: 1 retention-days: 1
@@ -81,10 +79,10 @@ jobs:
runs-on: macos-12 runs-on: macos-12
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Download Artifacts - name: Download Artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: nw-assets name: nw-assets
path: novelwriter/assets path: novelwriter/assets
@@ -93,11 +91,9 @@ jobs:
run: ./setup/macos/build.sh run: ./setup/macos/build.sh
- name: Upload DMG - name: Upload DMG
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: novelWriter-Packages name: MacOS-DMG
path: | path: dist_macos
dist_macos/novelWriter*.dmg
dist_macos/novelWriter*.dmg.sha256
if-no-files-found: error if-no-files-found: error
retention-days: 1 retention-days: 1
.github/workflows/syntax.yml
+2 -2
View File
@@ -15,12 +15,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: 3 python-version: 3
architecture: x64 architecture: x64
- name: Checkout Source - name: Checkout Source
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install flake8 - name: Install flake8
run: pip install flake8 run: pip install flake8
- name: Syntax Check - name: Syntax Check
.github/workflows/test_linux.yml
+2 -2
View File
@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
architecture: x64 architecture: x64
@@ -27,7 +27,7 @@ jobs:
sudo apt update sudo apt update
sudo apt install libenchant-2-dev qttools5-dev-tools aspell-en sudo apt install libenchant-2-dev qttools5-dev-tools aspell-en
- name: Checkout Source - name: Checkout Source
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install Dependencies (pip) - name: Install Dependencies (pip)
run: | run: |
pip install -U -r requirements.txt -r tests/requirements.txt pip install -U -r requirements.txt -r tests/requirements.txt
.github/workflows/test_mac.yml
+2 -2
View File
@@ -15,7 +15,7 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: "3.11" python-version: "3.11"
architecture: x64 architecture: x64
@@ -23,7 +23,7 @@ jobs:
run: | run: |
brew install enchant brew install enchant
- name: Checkout Source - name: Checkout Source
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install Dependencies (pip) - name: Install Dependencies (pip)
run: | run: |
pip install -U pyobjc -r requirements.txt -r tests/requirements.txt pip install -U pyobjc -r requirements.txt -r tests/requirements.txt
.github/workflows/test_win.yml
+2 -2
View File
@@ -15,12 +15,12 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- name: Python Setup - name: Python Setup
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: "3.11" python-version: "3.11"
architecture: x64 architecture: x64
- name: Checkout Source - name: Checkout Source
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install Dependencies (pip) - name: Install Dependencies (pip)
run: | run: |
pip install -U -r requirements.txt -r tests/requirements.txt pip install -U -r requirements.txt -r tests/requirements.txt
docs/source/int_started.rst
+1 -1
View File
@@ -82,7 +82,7 @@ Instead, run the following commands to add the repository and key:
.. code-block:: bash .. 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 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: Then run the update and install commands as for Ubuntu: