From 95d75d5633318522d566a484ae73b53dd0e635b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Fiti=C3=A9?= Date: Mon, 9 Oct 2023 08:45:16 +0200 Subject: [PATCH 1/2] Update branching strategy for staging (#318) (#319) (#320) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johan Fitié --- jobs/deploy.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jobs/deploy.ps1 b/jobs/deploy.ps1 index cbf9d4e3..b9e7ea6d 100644 --- a/jobs/deploy.ps1 +++ b/jobs/deploy.ps1 @@ -20,8 +20,9 @@ & "$PSScriptRoot\test.ps1" $DeployProduction = $Env:CI_COMMIT_REF_NAME -eq $Env:CI_DEFAULT_BRANCH -$DeployAcceptance = $DeployProduction -Or $Env:CI_COMMIT_MESSAGE.Contains('[ACC]') +$DeployAcceptance = $DeployProduction -Or $Env:CI_COMMIT_REF_NAME -eq 'staging' $DeployTesting = $true + if ($DeployTesting) {.\register.bat piaf-t} if ($DeployAcceptance) {.\register.bat piaf-a} if ($DeployProduction) {.\register.bat piaf} From 41fc1f9317b54541922bac593c1cc0ac3648f766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Fiti=C3=A9?= Date: Fri, 24 Nov 2023 10:52:52 +0100 Subject: [PATCH 2/2] DR: Require value type base data type (#321) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johan Fitié --- src/DBMDataRef/DBMDataRef.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DBMDataRef/DBMDataRef.vb b/src/DBMDataRef/DBMDataRef.vb index 4ce2d573..49e31f7d 100644 --- a/src/DBMDataRef/DBMDataRef.vb +++ b/src/DBMDataRef/DBMDataRef.vb @@ -240,13 +240,13 @@ Namespace Vitens.DynamicBandwidthMonitor Private Function ConfigurationIsValid As Boolean ' Check if this attribute is properly configured. The attribute and it's - ' parent (input source) need to be an instance of an object, and the data - ' type for both needs to be a double. + ' parent (input source) need to be an instance of an object, and the base + ' data type for both needs to be a value type. Return Attribute IsNot Nothing AndAlso - Attribute.Type Is GetType(Double) AndAlso + Attribute.Type.BaseType Is GetType(ValueType) AndAlso Attribute.Parent IsNot Nothing AndAlso - Attribute.Parent.Type Is GetType(Double) + Attribute.Parent.Type.BaseType Is GetType(ValueType) End Function