From 18bbf7d86f62e74941bcdba85b30fa26d112de17 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 18 Sep 2024 12:14:37 +0200 Subject: [PATCH 1/6] Switch to test signing for windows setup --- .github/workflows/build_win.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index ca7c7009..b6fca7d1 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -32,7 +32,7 @@ jobs: id: upload-unsigned-artifact uses: actions/upload-artifact@v4 with: - name: Win-Setup + name: Win-Setup-Unsigned path: dist/*.exe if-no-files-found: error retention-days: 14 @@ -43,7 +43,7 @@ jobs: api-token: "${{ secrets.SIGNPATH_API_TOKEN }}" organization-id: "0471e52c-66fa-4e9a-bfb9-36167095ca3f" project-slug: "novelWriter" - signing-policy-slug: "release-signing" + signing-policy-slug: "test-signing" github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}" wait-for-completion: true output-artifact-directory: "dist/" @@ -51,7 +51,7 @@ jobs: - name: Upload Signed Artifacts uses: actions/upload-artifact@v4 with: - name: Win-Setup + name: Win-Setup-Signed path: dist/*.exe if-no-files-found: error retention-days: 14 From b3f8a2c18c0072014583ca7dc4046008603f0d19 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 18 Sep 2024 13:11:08 +0200 Subject: [PATCH 2/6] Add version parameter to windows build --- .github/workflows/build_win.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index b6fca7d1..d8e7e41a 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -26,7 +26,9 @@ jobs: path: novelwriter/assets - name: Build Setup Installer - run: python pkgutils.py build-win-exe + run: | + BUILD_VERSION="$(python pkgutils.py version)" + python pkgutils.py build-win-exe - name: Upload Unsigned Artifacts id: upload-unsigned-artifact @@ -47,6 +49,8 @@ jobs: github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}" wait-for-completion: true output-artifact-directory: "dist/" + parameters: | + version: "${{ steps.vars.output.BUILD_VERSION }}" - name: Upload Signed Artifacts uses: actions/upload-artifact@v4 From b95e9fcda3b3c997d13cf74218ede1c5d2bfcf78 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 18 Sep 2024 13:39:17 +0200 Subject: [PATCH 3/6] Update for windows runner --- .github/workflows/build_win.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index d8e7e41a..9b7637fc 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -26,8 +26,9 @@ jobs: path: novelwriter/assets - name: Build Setup Installer + id: build-installer run: | - BUILD_VERSION="$(python pkgutils.py version)" + echo "BUILD_VERSION=$(python pkgutils.py version)" >> $Env:GITHUB_OUTPUT python pkgutils.py build-win-exe - name: Upload Unsigned Artifacts @@ -50,7 +51,7 @@ jobs: wait-for-completion: true output-artifact-directory: "dist/" parameters: | - version: "${{ steps.vars.output.BUILD_VERSION }}" + version: "${{ steps.build-installer.outputs.BUILD_VERSION }}" - name: Upload Signed Artifacts uses: actions/upload-artifact@v4 From c3f9ceb03a2374091d037d33d76c3b41270546a0 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:02:27 +0200 Subject: [PATCH 4/6] Add version numbers to all build jobs --- .github/workflows/build_linux.yml | 9 ++++++--- .github/workflows/build_mac.yml | 18 ++++++++++++------ .github/workflows/build_win.yml | 8 ++++---- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 9c607318..e19de538 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -32,12 +32,15 @@ jobs: path: novelwriter/assets - name: Build AppImage - run: python pkgutils.py build-appimage --linux-tag $LINUX_TAG --python-version $PYTHON_VERSION + id: build + run: | + echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT + python pkgutils.py build-appimage --linux-tag $LINUX_TAG --python-version $PYTHON_VERSION - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: Linux-AppImage - path: dist_appimage + name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Linux-AppImage + path: dist_appimage/*.AppImage* if-no-files-found: error retention-days: 14 diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml index 704d3e6e..6065f892 100644 --- a/.github/workflows/build_mac.yml +++ b/.github/workflows/build_mac.yml @@ -25,13 +25,16 @@ jobs: path: novelwriter/assets - name: Build App Bundle - run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH + id: build + run: | + echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT + ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH - name: Upload DMG uses: actions/upload-artifact@v4 with: - name: MacOS-AMD64-DMG - path: dist_macos + name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-MacOS-AMD64-DMG + path: dist_macos/*.dmg* if-no-files-found: error retention-days: 14 @@ -53,12 +56,15 @@ jobs: path: novelwriter/assets - name: Build App Bundle - run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH + id: build + run: | + echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT + ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH - name: Upload DMG uses: actions/upload-artifact@v4 with: - name: MacOS-M1-DMG - path: dist_macos + name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-MacOS-M1-DMG + path: dist_macos/*.dmg* if-no-files-found: error retention-days: 14 diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 9b7637fc..d7db1068 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -26,7 +26,7 @@ jobs: path: novelwriter/assets - name: Build Setup Installer - id: build-installer + id: build run: | echo "BUILD_VERSION=$(python pkgutils.py version)" >> $Env:GITHUB_OUTPUT python pkgutils.py build-win-exe @@ -35,7 +35,7 @@ jobs: id: upload-unsigned-artifact uses: actions/upload-artifact@v4 with: - name: Win-Setup-Unsigned + name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Win-Setup path: dist/*.exe if-no-files-found: error retention-days: 14 @@ -51,12 +51,12 @@ jobs: wait-for-completion: true output-artifact-directory: "dist/" parameters: | - version: "${{ steps.build-installer.outputs.BUILD_VERSION }}" + version: "${{ steps.build.outputs.BUILD_VERSION }}" - name: Upload Signed Artifacts uses: actions/upload-artifact@v4 with: - name: Win-Setup-Signed + name: novelWriter-${{ steps.build.outputs.BUILD_VERSION }}-Win-Setup-Signed path: dist/*.exe if-no-files-found: error retention-days: 14 From 238abdb567965925317325f792a5eef35090433b Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:33:45 +0200 Subject: [PATCH 5/6] Update to release certificate for windows build --- .github/workflows/build_win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index d7db1068..391a13c5 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -46,7 +46,7 @@ jobs: api-token: "${{ secrets.SIGNPATH_API_TOKEN }}" organization-id: "0471e52c-66fa-4e9a-bfb9-36167095ca3f" project-slug: "novelWriter" - signing-policy-slug: "test-signing" + signing-policy-slug: "release-signing " github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}" wait-for-completion: true output-artifact-directory: "dist/" From eda1a1c4dda8bced9646f07d01b12c79be009c2e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:52:24 +0200 Subject: [PATCH 6/6] Add sponsor link to readme --- README.md | 7 +++++++ setup/signpath_logo.png | Bin 0 -> 1470 bytes 2 files changed, 7 insertions(+) create mode 100644 setup/signpath_logo.png diff --git a/README.md b/README.md index ef16835e..ec43c328 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,13 @@ documentation. * PyPi Project: [pypi.org/project/novelWriter](https://pypi.org/project/novelWriter) * Social Media: [fosstodon.org/@novelwriter](https://fosstodon.org/@novelwriter) +## Sponsors + + + +Free code signing on Windows provided by [SignPath.io](https://about.signpath.io/), +certificate by [SignPath Foundation](https://signpath.org/). + ## Implementation novelWriter is written with Python 3 (3.9+) using Qt5 and PyQt5 (5.15 only), and is released on diff --git a/setup/signpath_logo.png b/setup/signpath_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6a98ba84bf0dd19684c8c2dc7149c79e734f6099 GIT binary patch literal 1470 zcmV;v1ws0WP)u#g(kRx5C2Cl9&C zO?)YCJOT;LHHW3;Pt8?59wK|!)qMx7cixk%Ra~f3I3a6bjHdvO<@1m? zf`TRWB7AyXHG?}yjO1#eiYDiIuKnH@%T9L*v5w7a1L08xsT4f%e+JU56f7FUn!y_; z^ohRp>|zFB%P+`wJu>t4&~cvjPaH!LCo;oA-^dWlCT2dTUfsCS3&6#)nUcalYe7=H zj6u5Y(ZEqJ!4JKf?-+d}11xzgYW9m7fbF3tb6n#lzNqKaMgxrH&H13?ecsCQg1t^0 z976_f^7LHk!l{Nx*F^Npj7ViYOH23RJ8TM>0aZK05`tBJZF>bWMY4}L1I+w2g<^Wv zR1$~hoC*~FD#d{cuqKm*1sVQlwDXDt+uP(YJ1sqHs&)RFLS@(5J)!5q-atA%GnG0} z*DQNsR5ZskN7L|mzTo@)O{W6We{>s$pOHpG(Im!iX?kO|pB$Abc}ov>0B%*;HZK5gGINl#56APq%!P8w8qBD1 z!!@$P6Vocstt{IXdQYEh_QlV3XXMyTW)4yc18|?25BbUDg&{Jt%eHS|6w%dfHeilmflb*Q z{Ev+dWD9ucNsI+fOcG$qc^9;Zd_A)J=GdBc7q9KF{e?6W>CFJHoEOq) z5NKn~PM6|^6CEmOdhn8~MVptKtMxfOzIpa^Ty@*_uX8Aiw;ng+TOfM@D*rOSPwtn- z>|f^)`<%Y-_aLlTx%3&<<%@9BeD)02R&_R$MQEU0LE+MAri77W8hd&0Ak(u zSNQ6xokLDWD89PtJ!A|V3tR8f-jXfYJPaurfsjesTe3NHJS+h0c<8F~;vpj=6f%W& zV-PLlCQ>3hD|t~zC7&vtBQ~*(#fbfUpjxP zQE09?l29}PAw#r1A<+A1X?u!`EdcTDnV2B-t?ns~`98)BK&-8963!eg4IOu>{%TRy z60yO4Q^J`qN~PNBrdT#{ZLixXfY0)5Fku7@j(QP}cHF-0b=@{dz0u?0L2Z>MK0aq4 zVC*Bp+UicshSeUaK5>Nx(5f9M|e8utGyG3*2QCjbEd Y|9DIWc~)ZNRsaA107*qoM6N<$f(ZD=9smFU literal 0 HcmV?d00001