From 39aa16d561f0852e915ad26cbfabe43c9eb4898c Mon Sep 17 00:00:00 2001
From: printfn <printfn@users.noreply.github.com>
Date: Wed, 27 Dec 2023 06:54:01 +0000
Subject: [PATCH] Add version number to MSI artifacts

---
 .github/workflows/actions.yml | 4 ++--
 CHANGELOG.md                  | 4 ++++
 contrib/deploy.sh             | 6 +++---
 documentation/index.md        | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 320c4333..3b10eaf7 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -229,7 +229,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ github.ref == 'refs/heads/main' && matrix.platform == 'windows-latest' }}
         with:
-          name: fend-windows-x64-msix
+          name: fend-${{ env.FEND_VERSION }}-windows-x64-msix
           path: windows-msix/fend-windows-x64.msix
           if-no-files-found: error
 
@@ -242,7 +242,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ matrix.platform == 'windows-latest' }}
         with:
-          name: fend-windows-x64-msi
+          name: fend-${{ env.FEND_VERSION }}-windows-x64-msi
           path: windows-wix/build/fend-windows-x64.msi
           if-no-files-found: error
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe6eb910..81a73590 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,10 @@
     > (5 volts) / (2 ohms)
     2.5 amperes
     ```
+- Rename Windows installer artifacts (MSI files) to also include the version
+    number, e.g. `fend-1.4.0-windows-x64.msi`.
+- Replace `nanorand` dependency with `rand`, which is better supported and
+    fixes compilation errors on FreeBSD.
 
 ### v1.3.3 (2023-12-08)
 
diff --git a/contrib/deploy.sh b/contrib/deploy.sh
index a211288a..54336599 100755
--- a/contrib/deploy.sh
+++ b/contrib/deploy.sh
@@ -225,8 +225,8 @@ zip --junk-paths "$TMPDIR/artifacts/fend-$NEW_VERSION-macos-x64.zip" \
     "$TMPDIR/artifacts/fend-$NEW_VERSION-macos-x64/fend"
 zip --junk-paths "$TMPDIR/artifacts/fend-$NEW_VERSION-windows-x64-exe.zip" \
     "$TMPDIR/artifacts/fend-$NEW_VERSION-windows-x64-exe/fend.exe"
-cp "$TMPDIR/artifacts/fend-windows-x64-msi/fend-windows-x64.msi" \
-    "$TMPDIR/artifacts/fend-windows-x64.msi"
+cp "$TMPDIR/artifacts/fend-$NEW_VERSION-windows-x64-msi/fend-windows-x64.msi" \
+    "$TMPDIR/artifacts/fend-$NEW_VERSION-windows-x64.msi"
 cp "$TMPDIR/artifacts/man-page/fend.1" \
     "$TMPDIR/artifacts/fend.1"
 
@@ -243,7 +243,7 @@ gh release --repo printfn/fend \
     "$TMPDIR/artifacts/fend-$NEW_VERSION-macos-aarch64.zip" \
     "$TMPDIR/artifacts/fend-$NEW_VERSION-macos-x64.zip" \
     "$TMPDIR/artifacts/fend-$NEW_VERSION-windows-x64-exe.zip" \
-    "$TMPDIR/artifacts/fend-windows-x64.msi" \
+    "$TMPDIR/artifacts/fend-$NEW_VERSION-windows-x64.msi" \
     "$TMPDIR/artifacts/fend.1"
 
 manualstep "Open https://github.com/printfn/fend/releases and check \
diff --git a/documentation/index.md b/documentation/index.md
index f2c53c20..b5a78e3b 100644
--- a/documentation/index.md
+++ b/documentation/index.md
@@ -35,8 +35,8 @@ If you want to install the fend command-line application, you have the following
 
 ### Windows
 
-On Windows, you can install fend with a standard Windows installer package,
-which you can download [here](https://github.com/printfn/fend/releases/latest/download/fend-windows-x64.msi).
+On Windows, you can install fend with a standard Windows installer package (MSI),
+which you can download [here](https://github.com/printfn/fend/releases/latest).
 
 Alternatively you can install fend via
 [`winget`](https://docs.microsoft.com/en-us/windows/package-manager/winget/):