fiftyone.geolocation 4.3.5 → 4.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ci/build-and-test.yml +5 -5
- package/ci/common-ci/.github/labels.yml +8 -2
- package/ci/common-ci/c/shared-variables.yml +15 -0
- package/ci/common-ci/create-tag.yml +8 -5
- package/ci/common-ci/java/shared-security-vulnerability-check.yml +54 -0
- package/ci/common-ci/release-config.json +235 -14
- package/ci/common-ci/scripts/modules/51DGitModule/51DGitModule.psm1 +89 -26
- package/ci/common-ci/shared-variables.yml +5 -1
- package/ci/create-packages.yml +7 -7
- package/ci/deploy-external.yml +1 -1
- package/ci/deploy-internal.yml +1 -1
- package/ci/shared-variables.yml +1 -7
- package/docs/Doxyfile +3 -3
- package/docs/DoxygenLayout.xml +1 -1
- package/package.json +5 -5
package/ci/build-and-test.yml
CHANGED
|
@@ -8,17 +8,17 @@ schedules:
|
|
|
8
8
|
include:
|
|
9
9
|
- develop
|
|
10
10
|
|
|
11
|
-
# Include the shared variables
|
|
12
|
-
variables:
|
|
13
|
-
- template: shared-variables.yml
|
|
14
|
-
- group: CIAutomation
|
|
15
|
-
|
|
16
11
|
resources:
|
|
17
12
|
repositories:
|
|
18
13
|
- repository: ciTemplates # Id of the repository used to reference to in this script
|
|
19
14
|
type: git
|
|
20
15
|
name: common-ci # Name of the actual repository
|
|
21
16
|
|
|
17
|
+
# Include the shared variables
|
|
18
|
+
variables:
|
|
19
|
+
- template: shared-variables.yml@ciTemplates
|
|
20
|
+
- group: CIAutomation
|
|
21
|
+
|
|
22
22
|
stages:
|
|
23
23
|
- template: shared-build-and-test-platforms.yml
|
|
24
24
|
parameters:
|
|
@@ -74,7 +74,13 @@
|
|
|
74
74
|
color: 6ff076
|
|
75
75
|
- name: "scheduled: 12th Jan 2022"
|
|
76
76
|
description: This item has been scheduled for 12th Jan 2022 release
|
|
77
|
-
color:
|
|
77
|
+
color: 6ff076
|
|
78
78
|
- name: "scheduled: 19th Jan 2022"
|
|
79
79
|
description: This item has been scheduled for 19th Jan 2022 release
|
|
80
|
-
color:
|
|
80
|
+
color: 6ff076
|
|
81
|
+
- name: "scheduled: 26th Jan 2022"
|
|
82
|
+
description: This item has been scheduled for 26th Jan 2022 release
|
|
83
|
+
color: 6ff076
|
|
84
|
+
- name: "scheduled: 2nd Feb 2022"
|
|
85
|
+
description: This item has been scheduled for 2nd Feb 2022 release
|
|
86
|
+
color: 6ff076
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
variables:
|
|
2
|
+
# Target Microsoft Toolset versions. Can't use full extended name
|
|
3
|
+
# as this is converted to environment variable and impact tools such as
|
|
4
|
+
# CMake
|
|
5
|
+
- name: plfTsVer # Platform Toolset Version.
|
|
6
|
+
value: 'v142'
|
|
7
|
+
# Visual Studio version. This should be consistent with platform toolset
|
|
8
|
+
# Used by Gyp where platform toolset version is not available to be set
|
|
9
|
+
# 2017 - v141
|
|
10
|
+
# 2019 - v142
|
|
11
|
+
# 2022 - v143
|
|
12
|
+
- name: msvsVer
|
|
13
|
+
value: '2019'
|
|
14
|
+
- name: winSDKVer # Windows SDK Version.
|
|
15
|
+
value: '10.0.19041.0'
|
|
@@ -25,12 +25,15 @@ stages:
|
|
|
25
25
|
submodules: recursive
|
|
26
26
|
persistCredentials: true
|
|
27
27
|
|
|
28
|
-
- task:
|
|
29
|
-
displayName:
|
|
30
|
-
# Give this task a name so we can use the variables it sets later.
|
|
31
|
-
name: GitVersion
|
|
28
|
+
- task: gitversion/setup@0
|
|
29
|
+
displayName: Install GitVersion
|
|
32
30
|
inputs:
|
|
33
|
-
|
|
31
|
+
versionSpec: '5.x'
|
|
32
|
+
|
|
33
|
+
- task: gitversion/execute@0
|
|
34
|
+
displayName: Determine Version
|
|
35
|
+
inputs:
|
|
36
|
+
useConfigFile: true
|
|
34
37
|
configFilePath: '$(Build.SourcesDirectory)/GitVersion.yml'
|
|
35
38
|
|
|
36
39
|
# Add a tag to the git repository with the version number.
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
parameters:
|
|
2
|
+
- name: imageName # Name of build image
|
|
3
|
+
- name: dependencies # Stages that this stage depends on
|
|
4
|
+
type: object
|
|
5
|
+
default: []
|
|
6
|
+
|
|
7
|
+
stages:
|
|
8
|
+
- stage: 'SecurityCheck'
|
|
9
|
+
displayName: 'Security Vulnerability Check'
|
|
10
|
+
dependsOn: ${{ parameters.dependencies }}
|
|
11
|
+
|
|
12
|
+
variables:
|
|
13
|
+
- group: CIAutomation
|
|
14
|
+
|
|
15
|
+
jobs:
|
|
16
|
+
- job: 'SecurityCheck'
|
|
17
|
+
displayName: 'Security Vulnerability Check'
|
|
18
|
+
|
|
19
|
+
pool:
|
|
20
|
+
vmImage: ${{ parameters.imageName }}
|
|
21
|
+
|
|
22
|
+
steps:
|
|
23
|
+
- checkout: self
|
|
24
|
+
submodules: recursive
|
|
25
|
+
lfs: true
|
|
26
|
+
persistCredentials: true
|
|
27
|
+
|
|
28
|
+
- task: MavenAuthenticate@0
|
|
29
|
+
inputs:
|
|
30
|
+
artifactsFeeds: '$(InternalFeedName)'
|
|
31
|
+
|
|
32
|
+
# Perform a security vulnerability check on the dependencies
|
|
33
|
+
# using dependency-check-maven plugin
|
|
34
|
+
- bash: |
|
|
35
|
+
mvn dependency-check:aggregate -Pdependency-check -Dfetchrepository.id=$REPO_ID -Dfetchrepository.url=$REPO_URL
|
|
36
|
+
env:
|
|
37
|
+
REPO_ID: $(fetchrepository.id)
|
|
38
|
+
REPO_URL: $(fetchrepository.url)
|
|
39
|
+
displayName: 'Maven dependency check'
|
|
40
|
+
|
|
41
|
+
# Copy report to staging directory to be published
|
|
42
|
+
- task: CopyFiles@2
|
|
43
|
+
displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
|
|
44
|
+
inputs:
|
|
45
|
+
SourceFolder: '$(build.sourcesdirectory)'
|
|
46
|
+
Contents: 'target/dependency-check-report.html'
|
|
47
|
+
TargetFolder: '$(build.artifactstagingdirectory)'
|
|
48
|
+
|
|
49
|
+
# Publish dependency check report
|
|
50
|
+
- task: PublishBuildArtifacts@1
|
|
51
|
+
displayName: 'Publish Artifact: dependency-check-report'
|
|
52
|
+
inputs:
|
|
53
|
+
PathtoPublish: '$(build.artifactstagingdirectory)'
|
|
54
|
+
ArtifactName: dependency-check-report
|
|
@@ -1,75 +1,296 @@
|
|
|
1
1
|
{
|
|
2
2
|
"repositories": {
|
|
3
3
|
"common-ci": {
|
|
4
|
-
"version": "4.
|
|
4
|
+
"version": "4.4.0",
|
|
5
5
|
"isLeaf": true
|
|
6
6
|
},
|
|
7
|
+
"device-detection-data": {
|
|
8
|
+
"version": "4.4.0",
|
|
9
|
+
"isLeaf": false
|
|
10
|
+
},
|
|
11
|
+
"common-cxx": {
|
|
12
|
+
"version": "4.4.0",
|
|
13
|
+
"isLeaf": false,
|
|
14
|
+
"dependencies": [
|
|
15
|
+
"common-ci"
|
|
16
|
+
]
|
|
17
|
+
},
|
|
7
18
|
"device-detection-cxx": {
|
|
8
|
-
"version": "4.
|
|
19
|
+
"version": "4.4.0",
|
|
20
|
+
"isLeaf": false,
|
|
21
|
+
"dependencies": [
|
|
22
|
+
"common-ci",
|
|
23
|
+
"common-cxx",
|
|
24
|
+
"device-detection-data"
|
|
25
|
+
]
|
|
26
|
+
},
|
|
27
|
+
"device-detection-varnish": {
|
|
28
|
+
"version": "4.4.0",
|
|
29
|
+
"isLeaf": false,
|
|
30
|
+
"dependencies": [
|
|
31
|
+
"common-ci",
|
|
32
|
+
"device-detection-cxx"
|
|
33
|
+
]
|
|
34
|
+
},
|
|
35
|
+
"device-detection-nginx": {
|
|
36
|
+
"version": "4.4.0",
|
|
37
|
+
"isLeaf": false,
|
|
38
|
+
"dependencies": [
|
|
39
|
+
"common-ci",
|
|
40
|
+
"device-detection-cxx"
|
|
41
|
+
]
|
|
42
|
+
},
|
|
43
|
+
"pipeline-java": {
|
|
44
|
+
"version": "4.4.0",
|
|
45
|
+
"packageName": "pipeline",
|
|
46
|
+
"versionVariableName": "pipeline.version",
|
|
9
47
|
"isLeaf": false,
|
|
10
48
|
"dependencies": [
|
|
11
49
|
"common-ci"
|
|
12
50
|
]
|
|
13
51
|
},
|
|
14
52
|
"location-java": {
|
|
15
|
-
"version": "4.
|
|
53
|
+
"version": "4.4.0",
|
|
16
54
|
"packageName": "pipeline.geo-location",
|
|
17
55
|
"versionVariableName": "geolocation.version",
|
|
18
56
|
"isLeaf": false,
|
|
19
57
|
"dependencies": [
|
|
20
58
|
"common-ci",
|
|
59
|
+
"pipeline-java",
|
|
21
60
|
"device-detection-java"
|
|
22
61
|
]
|
|
23
62
|
},
|
|
63
|
+
"location-onpremise-java": {
|
|
64
|
+
"version": "4.4.0",
|
|
65
|
+
"packageName": "geo-location.digitalelement",
|
|
66
|
+
"versionVariableName": "geolocation.digitalelement.version",
|
|
67
|
+
"isLeaf": false,
|
|
68
|
+
"dependencies": [
|
|
69
|
+
"common-ci",
|
|
70
|
+
"pipeline-java",
|
|
71
|
+
"location-java"
|
|
72
|
+
]
|
|
73
|
+
},
|
|
24
74
|
"device-detection-java": {
|
|
25
|
-
"version": "4.
|
|
75
|
+
"version": "4.4.0",
|
|
26
76
|
"packageName": "pipeline.device-detection",
|
|
27
77
|
"versionVariableName": "devicedetection.version",
|
|
28
78
|
"isLeaf": false,
|
|
29
79
|
"dependencies": [
|
|
30
80
|
"common-ci",
|
|
31
|
-
"device-detection-cxx"
|
|
81
|
+
"device-detection-cxx",
|
|
82
|
+
"pipeline-java"
|
|
83
|
+
]
|
|
84
|
+
},
|
|
85
|
+
"common-dotnet": {
|
|
86
|
+
"version": "4.4.0",
|
|
87
|
+
"packageName": "FiftyOne.Common",
|
|
88
|
+
"isLeaf": false,
|
|
89
|
+
"dependencies": [
|
|
90
|
+
"common-ci"
|
|
91
|
+
]
|
|
92
|
+
},
|
|
93
|
+
"caching-dotnet": {
|
|
94
|
+
"version": "4.4.0",
|
|
95
|
+
"packageName": "FiftyOne.Caching",
|
|
96
|
+
"isLeaf": false,
|
|
97
|
+
"dependencies": [
|
|
98
|
+
"common-ci"
|
|
99
|
+
]
|
|
100
|
+
},
|
|
101
|
+
"pipeline-dotnet": {
|
|
102
|
+
"version": "4.4.0",
|
|
103
|
+
"packageName": "FiftyOne.Pipeline",
|
|
104
|
+
"isLeaf": false,
|
|
105
|
+
"dependencies": [
|
|
106
|
+
"common-ci",
|
|
107
|
+
"common-dotnet",
|
|
108
|
+
"caching-dotnet"
|
|
109
|
+
]
|
|
110
|
+
},
|
|
111
|
+
"location-dotnet": {
|
|
112
|
+
"version": "4.4.0",
|
|
113
|
+
"packageName": "FiftyOne.Geolocation",
|
|
114
|
+
"isLeaf": false,
|
|
115
|
+
"dependencies": [
|
|
116
|
+
"common-ci",
|
|
117
|
+
"common-dotnet",
|
|
118
|
+
"pipeline-dotnet",
|
|
119
|
+
"device-detection-dotnet"
|
|
120
|
+
]
|
|
121
|
+
},
|
|
122
|
+
"device-detection-dotnet": {
|
|
123
|
+
"version": "4.4.0",
|
|
124
|
+
"packageName": "FiftyOne.DeviceDetection",
|
|
125
|
+
"isLeaf": false,
|
|
126
|
+
"dependencies": [
|
|
127
|
+
"common-ci",
|
|
128
|
+
"device-detection-cxx",
|
|
129
|
+
"caching-dotnet",
|
|
130
|
+
"common-dotnet",
|
|
131
|
+
"pipeline-dotnet"
|
|
132
|
+
]
|
|
133
|
+
},
|
|
134
|
+
"license-dotnet": {
|
|
135
|
+
"version": "4.4.0",
|
|
136
|
+
"packageName": "FiftyOne.(License|Resource)",
|
|
137
|
+
"isLeaf": false,
|
|
138
|
+
"dependencies": [
|
|
139
|
+
"common-ci"
|
|
140
|
+
]
|
|
141
|
+
},
|
|
142
|
+
"entitlement-dotnet": {
|
|
143
|
+
"version": "4.4.0",
|
|
144
|
+
"isLeaf": false,
|
|
145
|
+
"dependencies": [
|
|
146
|
+
"common-ci",
|
|
147
|
+
"common-dotnet",
|
|
148
|
+
"license-dotnet",
|
|
149
|
+
"pipeline-dotnet"
|
|
150
|
+
]
|
|
151
|
+
},
|
|
152
|
+
"internal-engines-dotnet": {
|
|
153
|
+
"version": "4.4.0",
|
|
154
|
+
"packageName": "FiftyOne.GeoLocation.OnPremise",
|
|
155
|
+
"isLeaf": false,
|
|
156
|
+
"dependencies": [
|
|
157
|
+
"common-ci",
|
|
158
|
+
"common-dotnet",
|
|
159
|
+
"pipeline-dotnet",
|
|
160
|
+
"device-detection-dotnet",
|
|
161
|
+
"location-dotnet"
|
|
162
|
+
]
|
|
163
|
+
},
|
|
164
|
+
"pipeline-node": {
|
|
165
|
+
"version": "4.4.0",
|
|
166
|
+
"packageName": "fiftyone.pipeline",
|
|
167
|
+
"isLeaf": false,
|
|
168
|
+
"dependencies": [
|
|
169
|
+
"common-ci"
|
|
32
170
|
]
|
|
33
171
|
},
|
|
34
172
|
"location-node": {
|
|
35
|
-
"version": "4.
|
|
173
|
+
"version": "4.4.0",
|
|
36
174
|
"packageName": "fiftyone.geolocation",
|
|
37
175
|
"isLeaf": false,
|
|
38
176
|
"dependencies": [
|
|
39
177
|
"common-ci",
|
|
178
|
+
"pipeline-node",
|
|
40
179
|
"device-detection-node"
|
|
41
180
|
]
|
|
42
181
|
},
|
|
43
182
|
"device-detection-node": {
|
|
44
|
-
"version": "4.
|
|
183
|
+
"version": "4.4.0",
|
|
45
184
|
"packageName": "fiftyone.devicedetection",
|
|
46
185
|
"isLeaf": false,
|
|
47
186
|
"dependencies": [
|
|
48
187
|
"common-ci",
|
|
49
|
-
"device-detection-cxx"
|
|
188
|
+
"device-detection-cxx",
|
|
189
|
+
"pipeline-node"
|
|
190
|
+
]
|
|
191
|
+
},
|
|
192
|
+
"pipeline-python": {
|
|
193
|
+
"version": "4.4.0",
|
|
194
|
+
"packageName": "fiftyone_pipeline",
|
|
195
|
+
"versionVariableName": "pipelineVersion",
|
|
196
|
+
"isLeaf": false,
|
|
197
|
+
"dependencies": [
|
|
198
|
+
"common-ci"
|
|
199
|
+
]
|
|
200
|
+
},
|
|
201
|
+
"location-python": {
|
|
202
|
+
"version": "4.4.0",
|
|
203
|
+
"packageName": "fiftyone_location",
|
|
204
|
+
"versionVariableName": "locationVersion",
|
|
205
|
+
"isLeaf": false,
|
|
206
|
+
"dependencies": [
|
|
207
|
+
"common-ci",
|
|
208
|
+
"pipeline-python"
|
|
50
209
|
]
|
|
51
210
|
},
|
|
52
211
|
"device-detection-python": {
|
|
53
|
-
"version": "4.
|
|
212
|
+
"version": "4.4.0",
|
|
54
213
|
"packageName": "fiftyone_devicedetection",
|
|
55
214
|
"versionVariableName": "deviceDetectionVersion",
|
|
56
215
|
"isLeaf": false,
|
|
57
216
|
"dependencies": [
|
|
58
217
|
"common-ci",
|
|
59
|
-
"device-detection-cxx"
|
|
218
|
+
"device-detection-cxx",
|
|
219
|
+
"pipeline-python"
|
|
220
|
+
]
|
|
221
|
+
},
|
|
222
|
+
"pipeline-php-core": {
|
|
223
|
+
"version": "4.4.0",
|
|
224
|
+
"packageName": "fiftyone.pipeline.core",
|
|
225
|
+
"isLeaf": false,
|
|
226
|
+
"dependencies": [
|
|
227
|
+
"common-ci"
|
|
228
|
+
]
|
|
229
|
+
},
|
|
230
|
+
"pipeline-php-engines": {
|
|
231
|
+
"version": "4.4.0",
|
|
232
|
+
"packageName": "fiftyone.pipeline.engines",
|
|
233
|
+
"isLeaf": false,
|
|
234
|
+
"dependencies": [
|
|
235
|
+
"common-ci",
|
|
236
|
+
"pipeline-php-core"
|
|
237
|
+
]
|
|
238
|
+
},
|
|
239
|
+
"pipeline-php-cloudrequestengine": {
|
|
240
|
+
"version": "4.4.0",
|
|
241
|
+
"packageName": "fiftyone.pipeline.cloudrequestengine",
|
|
242
|
+
"isLeaf": false,
|
|
243
|
+
"dependencies": [
|
|
244
|
+
"common-ci",
|
|
245
|
+
"pipeline-php-core",
|
|
246
|
+
"pipeline-php-engines"
|
|
247
|
+
]
|
|
248
|
+
},
|
|
249
|
+
"location-php": {
|
|
250
|
+
"version": "4.4.0",
|
|
251
|
+
"packageName": "fiftyone.geolocation",
|
|
252
|
+
"isLeaf": false,
|
|
253
|
+
"dependencies": [
|
|
254
|
+
"common-ci",
|
|
255
|
+
"pipeline-php-core",
|
|
256
|
+
"pipeline-php-engines",
|
|
257
|
+
"pipeline-php-cloudrequestengine",
|
|
258
|
+
"device-detection-php"
|
|
60
259
|
]
|
|
61
260
|
},
|
|
62
261
|
"device-detection-php-onpremise": {
|
|
63
|
-
"version": "4.
|
|
262
|
+
"version": "4.4.0",
|
|
64
263
|
"packageName": "fiftyone.devicedetection",
|
|
65
264
|
"isLeaf": false,
|
|
66
265
|
"dependencies": [
|
|
67
266
|
"common-ci",
|
|
68
|
-
"device-detection-cxx"
|
|
267
|
+
"device-detection-cxx",
|
|
268
|
+
"pipeline-php-core",
|
|
269
|
+
"pipeline-php-engines"
|
|
270
|
+
]
|
|
271
|
+
},
|
|
272
|
+
"device-detection-php": {
|
|
273
|
+
"version": "4.4.0",
|
|
274
|
+
"packageName": "fiftyone.devicedetection",
|
|
275
|
+
"isLeaf": false,
|
|
276
|
+
"dependencies": [
|
|
277
|
+
"common-ci",
|
|
278
|
+
"pipeline-php-core",
|
|
279
|
+
"pipeline-php-engines",
|
|
280
|
+
"pipeline-php-cloudrequestengine"
|
|
281
|
+
]
|
|
282
|
+
},
|
|
283
|
+
"pipeline-wordpress": {
|
|
284
|
+
"version": "4.4.0",
|
|
285
|
+
"packageName": "fiftyonedegrees.wordpress",
|
|
286
|
+
"isLeaf": false,
|
|
287
|
+
"dependencies": [
|
|
288
|
+
"common-ci",
|
|
289
|
+
"pipeline-php-cloudrequestengine"
|
|
69
290
|
]
|
|
70
291
|
},
|
|
71
292
|
"device-detection-go": {
|
|
72
|
-
"version": "4.
|
|
293
|
+
"version": "4.4.0",
|
|
73
294
|
"isLeaf": false,
|
|
74
295
|
"dependencies": [
|
|
75
296
|
"common-ci",
|
|
@@ -77,7 +298,7 @@
|
|
|
77
298
|
]
|
|
78
299
|
},
|
|
79
300
|
"device-detection-examples-go": {
|
|
80
|
-
"version": "4.
|
|
301
|
+
"version": "4.4.0",
|
|
81
302
|
"isLeaf": false,
|
|
82
303
|
"dependencies": [
|
|
83
304
|
"common-ci",
|
|
@@ -18,80 +18,139 @@ $script:releaseConfig = $null
|
|
|
18
18
|
$script:repositories = $null
|
|
19
19
|
|
|
20
20
|
class GitHandler {
|
|
21
|
+
static [boolean]Clean () {
|
|
22
|
+
$output = $(git clean -f -d)
|
|
23
|
+
$exitCode = $LASTEXITCODE
|
|
24
|
+
[boolean]$rtnCode = $exitCode -eq 0
|
|
25
|
+
if (!$rtnCode) {
|
|
26
|
+
Write-Host $output
|
|
27
|
+
Write-Host "# WARNING: Could not clean current dir properly. Exit code $exitCode."
|
|
28
|
+
}
|
|
29
|
+
return $rtnCode
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
static [boolean]UpdateSubmodules() {
|
|
33
|
+
$output = $(git submodule update --init --recursive)
|
|
34
|
+
$exitCode = $LASTEXITCODE
|
|
35
|
+
[boolean]$rtnCode = $exitCode -eq 0
|
|
36
|
+
if (!$rtnCode) {
|
|
37
|
+
Write-Host $output
|
|
38
|
+
Write-Host "# WARNING: Could not update submodules recursively. Exit code $exitCode."
|
|
39
|
+
}
|
|
40
|
+
return $rtnCode
|
|
41
|
+
}
|
|
42
|
+
|
|
21
43
|
static [boolean]Checkout ([string]$branchName) {
|
|
22
44
|
Write-Host "# Checkout $branchName"
|
|
23
|
-
git checkout "$branchName"
|
|
24
|
-
|
|
45
|
+
$output = $(git checkout "$branchName")
|
|
46
|
+
$exitCode = $LASTEXITCODE
|
|
47
|
+
[boolean]$rtnCode = $exitCode -eq 0
|
|
48
|
+
if (!$rtnCode) {
|
|
49
|
+
Write-Host $output
|
|
50
|
+
Write-Host "# ERROR: Failed to checkout '$branchName' recursively. Exit code $exitCode."
|
|
51
|
+
return $rtnCode
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
$rtnCode = [GitHandler]::UpdateSubmodules()
|
|
55
|
+
if (!$rtnCode) {
|
|
56
|
+
return $rtnCode
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
return [GitHandler]::Clean()
|
|
25
60
|
}
|
|
26
61
|
|
|
27
62
|
static [boolean]CheckoutTrack ([string]$branchName) {
|
|
28
63
|
Write-Host "# Checkout track $branchName"
|
|
29
|
-
git checkout --track "$branchName"
|
|
30
|
-
|
|
64
|
+
$output = $(git checkout --track "$branchName")
|
|
65
|
+
$exitCode = $LASTEXITCODE
|
|
66
|
+
[boolean]$rtnCode = $exitCode -eq 0
|
|
67
|
+
if (!$rtnCode) {
|
|
68
|
+
Write-Host $output
|
|
69
|
+
Write-Host "# ERROR: Failed to checkout '$branchName' recursively. Exit code $exitCode."
|
|
70
|
+
return $rtnCode
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
$rtnCode = [GitHandler]::UpdateSubmodules()
|
|
74
|
+
if (!$rtnCode) {
|
|
75
|
+
return $rtnCode
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
return [GitHandler]::Clean()
|
|
31
79
|
}
|
|
32
80
|
|
|
33
81
|
static [boolean]CheckoutNew ([string]$branchName) {
|
|
34
82
|
Write-Host "# Checkout New $branchName"
|
|
35
|
-
git checkout -b "$branchName"
|
|
36
|
-
return
|
|
83
|
+
$output = $(git checkout -b "$branchName")
|
|
84
|
+
return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
85
|
+
|
|
37
86
|
}
|
|
38
87
|
|
|
39
88
|
static [boolean]Pull () {
|
|
40
89
|
Write-Host "# Git pull"
|
|
41
|
-
git pull
|
|
42
|
-
return
|
|
90
|
+
$output = $(git pull)
|
|
91
|
+
return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
43
92
|
}
|
|
44
93
|
|
|
45
94
|
static [boolean]FetchAllTags () {
|
|
46
95
|
Write-Host "# Fetch all tags"
|
|
47
96
|
# git -c http.extraheader="AUTHORIZATION: bearer $env:SYSTEM_ACCESSTOKEN" fetch --all --tags
|
|
48
|
-
git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" fetch --all --tags
|
|
49
|
-
return
|
|
97
|
+
$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" fetch --all --tags)
|
|
98
|
+
return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
50
99
|
}
|
|
51
100
|
|
|
52
101
|
static [boolean]Push ([string]$branchName) {
|
|
53
102
|
if ([string]::IsNullOrEmpty($branchName)) {
|
|
54
103
|
Write-Host "# Git Push $branchName to origin"
|
|
55
|
-
git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" push
|
|
104
|
+
$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" push)
|
|
56
105
|
} else {
|
|
57
106
|
Write-Host "# Git Push"
|
|
58
|
-
git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" push origin "$branchName"
|
|
107
|
+
$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" push origin "$branchName")
|
|
59
108
|
}
|
|
60
|
-
return
|
|
109
|
+
return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
61
110
|
}
|
|
62
111
|
|
|
63
112
|
static [boolean]Commit ([string]$message) {
|
|
64
113
|
Write-Host "# Git commit"
|
|
65
|
-
git commit -m "$message"
|
|
66
|
-
return
|
|
114
|
+
$output = $(git commit -m "$message")
|
|
115
|
+
return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
67
116
|
}
|
|
68
117
|
|
|
69
118
|
static [boolean]Config ([string]$email, [string]$name) {
|
|
70
119
|
Write-Host "# Git config email '$email' and name '$name'"
|
|
71
|
-
git config user.email "$email"
|
|
72
|
-
[
|
|
73
|
-
|
|
74
|
-
|
|
120
|
+
$output = $(git config user.email "$email")
|
|
121
|
+
$rtnCode = [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
122
|
+
|
|
123
|
+
$output = $(git config user.name "$name")
|
|
124
|
+
return $rtnCode -and [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
75
125
|
}
|
|
76
126
|
|
|
77
127
|
static [boolean]Add ([string]$path) {
|
|
78
128
|
Write-Host "# Git stage '$path'"
|
|
79
|
-
git add "$path"
|
|
80
|
-
return
|
|
129
|
+
$output = $(git add "$path")
|
|
130
|
+
return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
81
131
|
}
|
|
82
132
|
|
|
83
133
|
static [boolean]CheckoutWithAuthorization ([string]$branchName) {
|
|
84
134
|
Write-Host "# Checkout with authorization $branchName"
|
|
85
135
|
# git -c http.extraheader="AUTHORIZATION: bearer $env:SYSTEM_ACCESSTOKEN" checkout "$branchName"
|
|
86
|
-
git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" checkout "$branchName"
|
|
87
|
-
return
|
|
136
|
+
$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" checkout "$branchName")
|
|
137
|
+
return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
88
138
|
}
|
|
89
139
|
|
|
90
140
|
static [boolean]Clone ([string]$url) {
|
|
91
141
|
Write-Host "# Clone $url"
|
|
92
142
|
# git -c http.extraheader="AUTHORIZATION: Bearer $env:SYSTEM_ACCESSTOKEN" clone "$url"
|
|
93
|
-
git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" clone "$url"
|
|
94
|
-
return
|
|
143
|
+
$output = $(git -c http.extraheader="AUTHORIZATION: $([Authorization]::AuthorizationString)" clone "$url")
|
|
144
|
+
return [GitHandler]::ProcessExitCode($LASTEXITCODE, $output)
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
static hidden [boolean]ProcessExitCode ([int]$exitCode, [string]$commandOutput) {
|
|
148
|
+
[boolean]$rtnCode = $exitCode -eq 0
|
|
149
|
+
if (!$rtnCode) {
|
|
150
|
+
Write-Host $commandOutput
|
|
151
|
+
Write-Host "WARNING: Failed with exit code $exitCode"
|
|
152
|
+
}
|
|
153
|
+
return $rtnCode
|
|
95
154
|
}
|
|
96
155
|
}
|
|
97
156
|
|
|
@@ -577,11 +636,15 @@ function Update-SubmoduleReferences {
|
|
|
577
636
|
Write-Host "================"
|
|
578
637
|
foreach ($submodule in $(git config --file .gitmodules --name-only --get-regexp path)) {
|
|
579
638
|
Write-Host ""
|
|
580
|
-
Write-Host "# Process submodule path $
|
|
639
|
+
Write-Host "# Process submodule path $submodule."
|
|
581
640
|
$submodulePath = Find-SubmodulePath -GitSubmodulePath $submodule
|
|
582
641
|
if ($submodulePath -ne $null) {
|
|
583
642
|
Write-Host "# Path $submodulePath extracted."
|
|
584
643
|
Push-Location $submodulePath
|
|
644
|
+
if (!$?) {
|
|
645
|
+
Write-Host "# ERROR: Failed to navigate to submodule $submodulePath"
|
|
646
|
+
return $false
|
|
647
|
+
}
|
|
585
648
|
|
|
586
649
|
# Get repo name
|
|
587
650
|
$subRepoName = Get-RepositoryName
|
package/ci/create-packages.yml
CHANGED
|
@@ -6,20 +6,20 @@ trigger:
|
|
|
6
6
|
# Don't trigger for a pull request
|
|
7
7
|
pr: none
|
|
8
8
|
|
|
9
|
+
resources:
|
|
10
|
+
repositories:
|
|
11
|
+
- repository: ciTemplates # Id of the repository used to reference to in this script
|
|
12
|
+
type: git
|
|
13
|
+
name: common-ci # Name of the actual repository
|
|
14
|
+
|
|
9
15
|
# Include shared variables
|
|
10
16
|
variables:
|
|
11
|
-
- template: shared-variables.yml
|
|
17
|
+
- template: shared-variables.yml@ciTemplates
|
|
12
18
|
- group: CIAutomation
|
|
13
19
|
# Access token for the git repository. Used by the git tag task.
|
|
14
20
|
- name: system_accesstoken
|
|
15
21
|
value: $(System.AccessToken)
|
|
16
22
|
|
|
17
|
-
resources:
|
|
18
|
-
repositories:
|
|
19
|
-
- repository: ciTemplates # Id of the repository used to reference to in this script
|
|
20
|
-
type: git
|
|
21
|
-
name: common-ci # Name of the actual repository
|
|
22
|
-
|
|
23
23
|
stages:
|
|
24
24
|
|
|
25
25
|
- stage: Publish
|
package/ci/deploy-external.yml
CHANGED
package/ci/deploy-internal.yml
CHANGED
package/ci/shared-variables.yml
CHANGED
package/docs/Doxyfile
CHANGED
|
@@ -38,7 +38,7 @@ PROJECT_NAME = "51Degrees Geo-Location Node.js"
|
|
|
38
38
|
# could be handy for archiving the generated documentation or if some version
|
|
39
39
|
# control system is used.
|
|
40
40
|
|
|
41
|
-
PROJECT_NUMBER = 4.
|
|
41
|
+
PROJECT_NUMBER = 4.4
|
|
42
42
|
|
|
43
43
|
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
|
44
44
|
# for a project that appears at the top of each page and should give viewer a
|
|
@@ -56,7 +56,7 @@ PROJECT_LOGO = ../../../docs/images/logo-51Degrees-Docs.png
|
|
|
56
56
|
# The PROJECT_URL tag is used to specify the URL which is linked by the
|
|
57
57
|
# PROJECT_LOGO.
|
|
58
58
|
|
|
59
|
-
PROJECT_URL = ../../documentation/4.
|
|
59
|
+
PROJECT_URL = ../../documentation/4.4/index.html
|
|
60
60
|
|
|
61
61
|
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
|
|
62
62
|
# into which the generated documentation will be written. If a relative path is
|
|
@@ -1101,7 +1101,7 @@ GENERATE_HTML = YES
|
|
|
1101
1101
|
# The default directory is: html.
|
|
1102
1102
|
# This tag requires that the tag GENERATE_HTML is set to YES.
|
|
1103
1103
|
|
|
1104
|
-
HTML_OUTPUT = 4.
|
|
1104
|
+
HTML_OUTPUT = 4.4
|
|
1105
1105
|
|
|
1106
1106
|
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
|
|
1107
1107
|
# generated HTML page (for example: .htm, .php, .asp).
|
package/docs/DoxygenLayout.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<!-- Generated by doxygen 1.8.15 -->
|
|
3
3
|
<!-- Navigation index tabs for HTML output -->
|
|
4
4
|
<navindex>
|
|
5
|
-
<tab type="user" visible="yes" title="General Docs" url="../../documentation/4.
|
|
5
|
+
<tab type="user" visible="yes" title="General Docs" url="../../documentation/4.4/index.html"/>
|
|
6
6
|
<tab type="pages" visible="yes" title="" intro=""/>
|
|
7
7
|
<tab type="classlist" visible="yes" title="Classes" intro="51Degrees Node.js classes. These contain the interfaces and logic of the geo-location engines."/>
|
|
8
8
|
<tab type="examples" visible="yes" title="Examples" intro="51Degrees geo-location examples."/>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fiftyone.geolocation",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.4.0",
|
|
4
4
|
"description": "Geo-location services for the 51Degrees Pipeline API",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "types/index.d.ts",
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
"Joseph Dix <joseph@51degrees.com> (https://51degrees.com)"
|
|
18
18
|
],
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"fiftyone.pipeline.cloudrequestengine": "^4.
|
|
21
|
-
"fiftyone.pipeline.core": "^4.
|
|
22
|
-
"fiftyone.pipeline.engines": "^4.
|
|
23
|
-
"fiftyone.pipeline.engines.fiftyone": "^4.
|
|
20
|
+
"fiftyone.pipeline.cloudrequestengine": "^4.4.0",
|
|
21
|
+
"fiftyone.pipeline.core": "^4.4.0",
|
|
22
|
+
"fiftyone.pipeline.engines": "^4.4.0",
|
|
23
|
+
"fiftyone.pipeline.engines.fiftyone": "^4.4.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@types/node": "^15.12.2",
|