Merge pull request 6540 from hotfix/v4.3.3 into main

ci/build-and-test.yml

@@ -7,23 +7,26 @@ schedules:
   branches:
     include:
     - develop
-
-# Include shared variables
-variables:
-- template: shared-variables.yml
-- group: CIAutomation # Required to access CI variables
 
 # Add the common-ci git repo as a resource to access common templates.
 resources:
   repositories:
   - repository: ciTemplates # Id of the repository used to reference to in this script
     type: git
     name: common-ci # Name of the actual repository
+
+# Include shared variables
+variables:
+- template: shared-variables.yml@ciTemplates
+- group: CIAutomation # Required to access CI variables
 
 stages:
 - template: shared-build-and-test-stage.yml
   parameters:
     runTests: variables['RunTests']
+    windowsImage: ${{ variables.windowsImage }}
+    linuxImage: ${{ variables.linuxImage }}
+    macImage: ${{ variables.macImage }}
 
 # Try to complete the corresponding pull request if
 # this is triggered by one.    

ci/deploy.yml

@@ -21,6 +21,7 @@ resources:
 variables:
   # Include shared variables
 - template: shared-variables.yml
+- template: shared-variables.yml@ciTemplates
 
 stages:
 # Publish to Github 

ci/shared-build-and-test-stage.yml

@@ -6,6 +6,9 @@ parameters:
 - name: goVersion
   type: string
   default: '1.17.1'
+- name: windowsImage
+- name: linuxImage
+- name: macImage
 
 stages:
 - stage: Linux
@@ -21,17 +24,11 @@ stages:
 
       strategy:
         matrix:
-          Ubuntu 18 x86:
-            imageName: 'ubuntu-18.04'
+          Linux x86:
+            imageName: ${{ parameters.linuxImage }}
             platform: 'x86'
-          Ubuntu 18 x64:
-            imageName: 'ubuntu-18.04'
-            platform: 'x64'
-          Ubuntu 20 x86:
-            imageName: 'ubuntu-20.04'
-            platform: 'x86'
-          Ubuntu 20 x64:
-            imageName: 'ubuntu-20.04'
+          Liniux x64:
+            imageName: ${{ parameters.linuxImage }}
             platform: 'x64'
 
       pool:
@@ -118,10 +115,8 @@ stages:
 
       strategy:
         matrix:
-          MacOS 10.14:
-            imageName: 'macOS-10.14'
-          MacOS 10.15:
-            imageName: 'macOS-10.15'
+          MacOS:
+            imageName: ${{ parameters.macImage }}
 
       pool:
         vmImage: $(imageName)
@@ -166,8 +161,8 @@ stages:
 
       strategy:
         matrix:
-          Windows VS 2019:
-            imageName: 'windows-2019'
+          Windows:
+            imageName: ${{ parameters.windowsImage }}
 
       pool:
         vmImage: $(imageName)

ci/shared-variables.yml

@@ -1,9 +1,3 @@
 variables:
-- name: windowsImage
-  value: 'vs2017-win2016'
-- name: linuxImage
-  value: 'ubuntu-18.04'
-- name: macImage
-  value: 'macOS-10.14'
 - name: goVersion
   value: '1.17.1'

ci/tag-repository.yml

@@ -17,7 +17,7 @@ resources:
 
 variables:
 # Include shared variables
-- template: shared-variables.yml
+- template: shared-variables.yml@ciTemplates
 
 stages:
 - stage: Tagging

go.mod

@@ -2,6 +2,6 @@ module github.com/51Degrees/device-detection-examples-go/v4
 
 go 1.17
 
-require github.com/51Degrees/device-detection-go/v4 v4.3.3
+require github.com/51Degrees/device-detection-go/v4 v4.3.4
 
-replace github.com/51Degrees/device-detection-go/v4 v4.3.3 => ./device-detection-go
+replace github.com/51Degrees/device-detection-go/v4 v4.3.4 => ./device-detection-go