summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2025-10-16 14:35:18 +0200
committerLinus Färnstrand <linus@mullvad.net>2025-10-16 14:35:18 +0200
commitf1507c141413d2735e5c09bbd0e3af10646dff05 (patch)
tree5bd60ade686b217401328c5f14fa1c183e922a35
parent42cdcdbf920e2a03ec0abd3e76e25b9209fc6519 (diff)
parent76f7526eb4a10e5cbc75157edacda9d519c9dad9 (diff)
downloadmullvadvpn-f1507c141413d2735e5c09bbd0e3af10646dff05.tar.xz
mullvadvpn-f1507c141413d2735e5c09bbd0e3af10646dff05.zip
Merge branch 'fix-mullvad-nsis-header'
-rw-r--r--.github/workflows/mullvad-nsis.yml30
-rw-r--r--mullvad-nsis/include/mullvad-nsis.h2
2 files changed, 31 insertions, 1 deletions
diff --git a/.github/workflows/mullvad-nsis.yml b/.github/workflows/mullvad-nsis.yml
new file mode 100644
index 0000000000..bb3488f471
--- /dev/null
+++ b/.github/workflows/mullvad-nsis.yml
@@ -0,0 +1,30 @@
+---
+name: Check mullvad-nsis
+on:
+ pull_request:
+ paths:
+ - mullvad-nsis/**
+ workflow_dispatch:
+
+permissions: {}
+
+jobs:
+ check-mullvad-nsis:
+ runs-on: windows-latest
+ steps:
+ # By default, the longest path a filename can have in git on Windows is 260 character.
+ - name: Set git config for long paths
+ run: git config --system core.longpaths true
+
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - uses: ./.github/actions/mullvad-build-env
+
+ - name: Build mullvad-nsis
+ shell: bash
+ run: cargo build --target i686-pc-windows-msvc -p mullvad-nsis
+
+ - name: Check working directory is clean
+ shell: bash
+ run: git diff --exit-code HEAD --
diff --git a/mullvad-nsis/include/mullvad-nsis.h b/mullvad-nsis/include/mullvad-nsis.h
index f8870acff9..5f48574862 100644
--- a/mullvad-nsis/include/mullvad-nsis.h
+++ b/mullvad-nsis/include/mullvad-nsis.h
@@ -53,7 +53,7 @@ Status get_system_version(uint16_t *buffer, uintptr_t *buffer_size);
/// Write OS version into `version_out` when `Status::Ok` is returned.
///
/// # Safety
-/// `version_out` should point to a valid `WindowsVer`
+/// `version_out` must point to a valid `WindowsVer`
Status get_system_version_struct(WindowsVer *version_out);
} // extern "C"