Skip to content

Commit 8920836

Browse files
TomPallisterTomPallister
committed
+semver: major updated build
1 parent c444c25 commit 8920836

File tree

7 files changed

+46
-49
lines changed

7 files changed

+46
-49
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ orbs:
44
jobs:
55
build:
66
docker:
7-
- image: mijitt0m/ocelot-build:0.0.6
7+
- image: mijitt0m/ocelot-build:0.0.7
88
steps:
99
- checkout
1010
- run: dotnet tool restore && dotnet cake
1111
release:
1212
docker:
13-
- image: mijitt0m/ocelot-build:0.0.6
13+
- image: mijitt0m/ocelot-build:0.0.7
1414
steps:
1515
- checkout
1616
- run: dotnet tool restore && dotnet cake --target=Release

‎docker/Dockerfile.base‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# syntax=docker/dockerfile:1
2-
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine
1+
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine
32

43
RUN apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib
54

65
RUN curl -L --output ./dotnet-install.sh https://dot.net/v1/dotnet-install.sh
76

87
RUN chmod u+x ./dotnet-install.sh
98

10-
RUN ./dotnet-install.sh -c 5.0 -i /usr/share/dotnet
9+
RUN ./dotnet-install.sh -c 6.0 -i /usr/share/dotnet

‎docker/Dockerfile.build‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# syntax=docker/dockerfile:1
21
# call from ocelot repo root with
32
# docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
43
# docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
5-
FROM mijitt0m/ocelot-build:0.0.6
4+
FROM mijitt0m/ocelot-build:0.0.7
65

76
ARG OCELOT_COVERALLS_TOKEN
87

‎docker/Dockerfile.release‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# syntax=docker/dockerfile:1
21
# call from ocelot repo root with
32
# docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
43
# docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
5-
FROM mijitt0m/ocelot-build:0.0.6
4+
FROM mijitt0m/ocelot-build:0.0.7
65

76
ARG OCELOT_COVERALLS_TOKEN
87
ARG OCELOT_NUTGET_API_KEY

‎docker/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# this script build the ocelot docker file
2-
version=0.0.6
2+
version=0.0.7
33
docker build --platform linux/amd64 -t mijitt0m/ocelot-build -f Dockerfile.base .
44
echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
55
docker tag mijitt0m/ocelot-build mijitt0m/ocelot-build:$version

‎test/Ocelot.ManualTest/Ocelot.postman_collection.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "4dbde9fe-89f5-be35-bb9f-d3b438e16375",
33
"name": "Ocelot",
4-
"description": string.Empty,
4+
"description": "",
55
"order": [
66
"a1c95935-ed18-d5dc-bcb8-a3db8ba1934f",
77
"ea0ed57a-2cb9-8acc-47dd-006b8db2f1b2",
@@ -29,8 +29,8 @@
2929
"data": null,
3030
"rawModeData": null,
3131
"descriptionFormat": "html",
32-
"description": string.Empty,
33-
"headers": string.Empty,
32+
"description": "",
33+
"headers": "",
3434
"method": "GET",
3535
"pathVariables": {},
3636
"url": "http://localhost:5000/comments?postId=1",
@@ -52,7 +52,7 @@
5252
"key": "Authorization",
5353
"value": "Bearer {{AccessToken}}",
5454
"enabled": true,
55-
"description": string.Empty
55+
"description": ""
5656
}
5757
],
5858
"url": "http://localhost:5000/administration/configuration",
@@ -69,7 +69,7 @@
6969
"helperAttributes": "{}",
7070
"time": 1508849878025,
7171
"name": "GET http://localhost:5000/admin/configuration",
72-
"description": string.Empty,
72+
"description": "",
7373
"collectionId": "4dbde9fe-89f5-be35-bb9f-d3b438e16375",
7474
"responses": [],
7575
"isFromCollection": true,
@@ -79,7 +79,7 @@
7979
},
8080
{
8181
"id": "37bfa9f1-fe29-6a68-e558-66d125d2c96f",
82-
"headers": string.Empty,
82+
"headers": "",
8383
"headerData": [],
8484
"url": "http://localhost:5000/administration/connect/token",
8585
"folder": null,
@@ -132,7 +132,7 @@
132132
"helperAttributes": "{}",
133133
"time": 1506359585080,
134134
"name": "POST http://localhost:5000/admin/connect/token copy",
135-
"description": string.Empty,
135+
"description": "",
136136
"collectionId": "4dbde9fe-89f5-be35-bb9f-d3b438e16375",
137137
"responses": [],
138138
"isFromCollection": true,
@@ -148,8 +148,8 @@
148148
"data": null,
149149
"rawModeData": null,
150150
"descriptionFormat": "html",
151-
"description": string.Empty,
152-
"headers": string.Empty,
151+
"description": "",
152+
"headers": "",
153153
"method": "DELETE",
154154
"pathVariables": {},
155155
"url": "http://localhost:5000/posts/1",
@@ -170,7 +170,7 @@
170170
{
171171
"key": "Authorization",
172172
"value": "Bearer {{AccessToken}}",
173-
"description": string.Empty,
173+
"description": "",
174174
"enabled": true
175175
}
176176
],
@@ -188,7 +188,7 @@
188188
"helperAttributes": {},
189189
"time": 1508849923518,
190190
"name": "GET http://localhost:5000/admin/.well-known/openid-configuration",
191-
"description": string.Empty,
191+
"description": "",
192192
"collectionId": "4dbde9fe-89f5-be35-bb9f-d3b438e16375",
193193
"responses": []
194194
},
@@ -237,8 +237,8 @@
237237
],
238238
"rawModeData": null,
239239
"descriptionFormat": "html",
240-
"description": string.Empty,
241-
"headers": string.Empty,
240+
"description": "",
241+
"headers": "",
242242
"method": "POST",
243243
"pathVariables": {},
244244
"url": "http://localhost:5000/admin/configuration",
@@ -260,8 +260,8 @@
260260
"data": null,
261261
"rawModeData": null,
262262
"descriptionFormat": "html",
263-
"description": string.Empty,
264-
"headers": string.Empty,
263+
"description": "",
264+
"headers": "",
265265
"method": "GET",
266266
"pathVariables": {},
267267
"url": "http://localhost:5000/posts/1/comments",
@@ -283,8 +283,8 @@
283283
"data": [],
284284
"rawModeData": "{\n \"title\": \"gfdgsgsdgsdfgsdfgdfg\",\n}",
285285
"descriptionFormat": "html",
286-
"description": string.Empty,
287-
"headers": string.Empty,
286+
"description": "",
287+
"headers": "",
288288
"method": "PATCH",
289289
"pathVariables": {},
290290
"url": "http://localhost:5000/posts/1",
@@ -306,8 +306,8 @@
306306
"data": [],
307307
"rawModeData": "{\n \"userId\": 1,\n \"title\": \"test\",\n \"body\": \"test\"\n}",
308308
"descriptionFormat": "html",
309-
"description": string.Empty,
310-
"headers": string.Empty,
309+
"description": "",
310+
"headers": "",
311311
"method": "POST",
312312
"pathVariables": {},
313313
"url": "http://localhost:5000/posts",
@@ -329,8 +329,8 @@
329329
"data": null,
330330
"rawModeData": null,
331331
"descriptionFormat": "html",
332-
"description": string.Empty,
333-
"headers": string.Empty,
332+
"description": "",
333+
"headers": "",
334334
"method": "GET",
335335
"pathVariables": {},
336336
"url": "http://localhost:5000/posts/1",
@@ -352,8 +352,8 @@
352352
"data": [],
353353
"rawModeData": "{\n \"userId\": 1,\n \"title\": \"test\",\n \"body\": \"test\"\n}",
354354
"descriptionFormat": "html",
355-
"description": string.Empty,
356-
"headers": string.Empty,
355+
"description": "",
356+
"headers": "",
357357
"method": "PUT",
358358
"pathVariables": {},
359359
"url": "http://localhost:5000/posts/1",
@@ -368,4 +368,4 @@
368368
"collectionId": "4dbde9fe-89f5-be35-bb9f-d3b438e16375"
369369
}
370370
]
371-
}
371+
}

‎test/Ocelot.UnitTests/Configuration/Validation/RouteFluentValidatorTests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
{
33
using System;
44
using System.Collections.Generic;
5-
using System.Threading.Tasks;
6-
7-
using FluentValidation.Results;
8-
5+
using System.Threading.Tasks;
6+
7+
using FluentValidation.Results;
8+
99
using Microsoft.AspNetCore.Authentication;
10-
using Microsoft.AspNetCore.Http;
11-
12-
using Moq;
13-
10+
using Microsoft.AspNetCore.Http;
11+
12+
using Moq;
13+
1414
using Ocelot.Configuration.File;
1515
using Ocelot.Configuration.Validator;
16-
using Ocelot.Requester;
17-
18-
using Shouldly;
19-
20-
using TestStack.BDDfy;
21-
16+
using Ocelot.Requester;
17+
18+
using Shouldly;
19+
20+
using TestStack.BDDfy;
21+
2222
using Xunit;
2323

2424
public class RouteFluentValidatorTests
@@ -346,7 +346,7 @@ public void should_be_valid_re_route_using_downstream_http_version(string versio
346346
.BDDfy();
347347
}
348348

349-
[Theory(Skip = "Not work on non-english windows")]
349+
[Theory]
350350
[InlineData("retg1.1")]
351351
[InlineData("re2.0")]
352352
[InlineData("1,0a")]

0 commit comments

Comments
 (0)