From a0ac1236933cd44700e396f353b4de6053257cd2 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Thu, 21 Nov 2024 13:51:31 +0000
Subject: [PATCH 1/2] iviumsoft: skip netsh commands if running under CI
---
packages/iviumsoft.xml | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/packages/iviumsoft.xml b/packages/iviumsoft.xml
index 4a444be6..df620f8e 100755
--- a/packages/iviumsoft.xml
+++ b/packages/iviumsoft.xml
@@ -12,8 +12,16 @@
<install cmd='%WPKGSOFTWARE%\ivium\iviumsoft\iviumsoftsetup-%version%.exe /sp- /verysilent /suppressmsgboxes /norestart' />
<!-- upon launching the software, Windows firewall asks to grant network access. Upon clicking 'cancel' it creates
the following pair of rules - so we do so too, as I've not determined any reason why it needs access -->
- <install cmd='netsh advfirewall firewall add rule name="deny iviumsoft udp" dir=in program="c:\iviumstat\iviumsoft.exe" protocol=udp action=block' />
- <install cmd='netsh advfirewall firewall add rule name="deny iviumsoft tcp" dir=in program="c:\iviumstat\iviumsoft.exe" protocol=tcp action=block' />
+ <install cmd='netsh advfirewall firewall add rule name="deny iviumsoft udp" dir=in program="c:\iviumstat\iviumsoft.exe" protocol=udp action=block'>
+ <condition>
+ <check type="host" condition="environment" value="GITLAB_CI=^$" />
+ </condition>
+ </install>
+ <install cmd='netsh advfirewall firewall add rule name="deny iviumsoft tcp" dir=in program="c:\iviumstat\iviumsoft.exe" protocol=tcp action=block'>
+ <condition>
+ <check type="host" condition="environment" value="GITLAB_CI=^$" />
+ </condition>
+ </install>
<upgrade include='remove' />
<upgrade include='install' />
@@ -21,8 +29,18 @@
<remove cmd='"c:\iviumstat\unins000.exe" /VERYSILENT /suppressmsgboxes /norestart'>
<exit code="-1"/>
</remove>
- <remove cmd='netsh advfirewall firewall del rule name="deny iviumsoft udp"'><exit code='1' /></remove>
- <remove cmd='netsh advfirewall firewall del rule name="deny iviumsoft tcp"'><exit code='1' /></remove>
+ <remove cmd='netsh advfirewall firewall del rule name="deny iviumsoft udp"'>
+ <condition>
+ <check type="host" condition="environment" value="GITLAB_CI=^$" />
+ </condition>
+ <exit code='1' />
+ </remove>
+ <remove cmd='netsh advfirewall firewall del rule name="deny iviumsoft tcp"'>
+ <condition>
+ <check type="host" condition="environment" value="GITLAB_CI=^$" />
+ </condition>
+ <exit code='1' />
+ </remove>
</package>
</packages:packages>
--
GitLab
From 7222b229238d335349c3c1ea7361e41973407052 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Thu, 21 Nov 2024 13:52:22 +0000
Subject: [PATCH 2/2] iviumsoft: cease marking CI as broken
CI is hopefully useful as of a0ac123
---
packages/iviumsoft.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/packages/iviumsoft.xml b/packages/iviumsoft.xml
index df620f8e..480f91ea 100755
--- a/packages/iviumsoft.xml
+++ b/packages/iviumsoft.xml
@@ -5,7 +5,6 @@
<variable name="major" value="4" />
<variable name="minor" value="1172" />
<variable name="version" value="%major%.%minor%" />
- <variable name="GIT_CITEST" value="broken" /><!-- Advfireall - file not found -->
<check type="uninstall" path="IviumSoft %major%" condition="versiongreaterorequal" value="%version%" />
--
GitLab